somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

충돌 해결

Browse Source
This commit is contained in:
com02 2021-11-23 08:11:25 +09:00
parent a7d7081809
commit 047b75d0b7
34 changed files with 926 additions and 748 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/nlib/col/service/CollectionService.java
View File

@ -55,7 +55,7 @@ public interface CollectionService {
* @return
* @throws Exception
*/
public List<CollectionVO> setDetailInfoForList(List<CollectionVO> list, String mbInfoId, String defaultThumbnailUrl) throws Exception;
public List<CollectionVO> setDetailInfoForList(List<CollectionVO> list, String mbInfoId) throws Exception;
/**
* 목록의 자료정보에 상세정보를 조회하여 설정한 후 리턴한다.
@ -66,7 +66,7 @@ public interface CollectionService {
* @return
* @throws Exception
*/
public List<CollectionVO> setDetailInfoForHashList(List<HashMap<String, String>> list, String mbInfoId, String defaultThumbnailUrl) throws Exception;
public List<CollectionVO> setDetailInfoForHashList(List<HashMap<String, String>> list, String mbInfoId) throws Exception;
/**
* 자료 마스터ID 목록 문자열을 받아 CollectionVO 리스트 생성하여 리턴한다.
@ -82,7 +82,7 @@ public interface CollectionService {
* @param masterIds
* @return
*/
public List<CollectionVO> makeInfoListOfCollectionVO(String masterIds, String mbInfoId, String defaultThumbnailUrl) throws Exception;
public List<CollectionVO> makeInfoListOfCollectionVO(String masterIds, String mbInfoId) throws Exception;
/**
* 자료상세조회 및 원문보기시에 로그

14
src/main/java/nlib/col/service/CollectionVO.java
View File

@ -231,15 +231,15 @@ public class CollectionVO extends PagingVO {
*/
public boolean isAbleOther() {
// 기본공개
if(!isPub()) return false;
// 방문열람여부
if(isAbleRead()) return false;
// 대출여부
if(isAbleRent()) return false;
// 온라인여부
if(isAbleOnline()) return false;
return true;
}
@ -890,9 +890,17 @@ public class CollectionVO extends PagingVO {
this.rtnDd = rtnDd;
}
public String getmUseYn() {
return getMUseYn();
}
public String getMUseYn() {
return StringUtil.isEmpty(mUseYn) ? "N" : mUseYn;
}
public void setmUseYn(String mUseYn) {
setMUseYn(mUseYn);
}
public void setMUseYn(String mUseYn) {
this.mUseYn = mUseYn;

16
src/main/java/nlib/col/service/impl/CollectionServiceImpl.java
View File

@ -103,7 +103,7 @@ public class CollectionServiceImpl implements CollectionService {
* @throws Exception
*/
public List<CollectionVO> setDetailInfoForList(List<CollectionVO> list) throws Exception {
return setDetailInfoForList(list, null, null);
return setDetailInfoForList(list, null);
}
/**
@ -115,7 +115,7 @@ public class CollectionServiceImpl implements CollectionService {
* @return
* @throws Exception
*/
public List<CollectionVO> setDetailInfoForList(List<CollectionVO> list, String mbInfoId, String defaultThumbnailUrl) throws Exception {
public List<CollectionVO> setDetailInfoForList(List<CollectionVO> list, String mbInfoId) throws Exception {
if(list == null || list.size() < 1) return list;
@ -196,7 +196,7 @@ public class CollectionServiceImpl implements CollectionService {
vo.setReqPsblYn (StringUtil.getString(cVO.getReqPsblYn() , vo.getReqPsblYn()));
vo.setInterestYn (StringUtil.getString(cVO.getInterestYn() , vo.getInterestYn()));
vo.setMUseYn (StringUtil.getString(cVO.getMUseYn() , vo.getMUseYn()));
vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn()));
vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn()));
vo.setMngOrgCd (StringUtil.getString(cVO.getMngOrgCd() , vo.getMngOrgCd()));
vo.setMngOrgNm (StringUtil.getString(cVO.getMngOrgNm() , vo.getMngOrgNm()));
@ -215,7 +215,7 @@ public class CollectionServiceImpl implements CollectionService {
* @return
* @throws Exception
*/
public List<CollectionVO> setDetailInfoForHashList(List<HashMap<String, String>> list, String mbInfoId, String defaultThumbnailUrl) throws Exception {
public List<CollectionVO> setDetailInfoForHashList(List<HashMap<String, String>> list, String mbInfoId) throws Exception {
List<CollectionVO> listObj = new ArrayList<CollectionVO>();
@ -228,7 +228,7 @@ public class CollectionServiceImpl implements CollectionService {
}
}
return setDetailInfoForList(listObj, mbInfoId, defaultThumbnailUrl);
return setDetailInfoForList(listObj, mbInfoId);
}
@ -267,13 +267,13 @@ public class CollectionServiceImpl implements CollectionService {
* @param masterIds
* @return
*/
public List<CollectionVO> makeInfoListOfCollectionVO(String masterIds, String mbInfoId, String defaultThumbnailUrl) throws Exception {
public List<CollectionVO> makeInfoListOfCollectionVO(String masterIds, String mbInfoId) throws Exception {
List<CollectionVO> retList = makeListOfCollectionVO(masterIds);
if(retList == null || retList.size() < 1) return null;
return setDetailInfoForList(retList, mbInfoId, defaultThumbnailUrl);
return setDetailInfoForList(retList, mbInfoId);
}
/**
@ -305,5 +305,5 @@ public class CollectionServiceImpl implements CollectionService {
public List<CollectionVO> selectSimilarList(CollectionVO vo) throws Exception {
return collectionDAO.selectSimilarList(vo);
}
}

2
src/main/java/nlib/col/service/impl/RentServiceImpl.java
View File

@ -188,6 +188,8 @@ public class RentServiceImpl implements RentService
} else {
cVO.setRsrvId(null);
cVO.setRsrvDd(null);
cVO.setResultCode(resVO.getResultCode());
cVO.setResultMessage(resVO.getResultMessage());
}
}

4
src/main/java/nlib/col/web/CartController.java
View File

@ -90,7 +90,7 @@ public class CartController extends NlibCommonController
list = cartService.listCartItemsFromCookie(request, response, cartTypeCd);
// 카트 목록 자료에 대한 상세자료 설정
collectionService.setDetailInfoForList(list, null, NlibProperty.getString("thumbnail.image.url.small"));
collectionService.setDetailInfoForList(list, null);
// 문화원별 정렬 처리
list = sortCollectionListByMngOrgCd(list);
@ -103,7 +103,7 @@ public class CartController extends NlibCommonController
list = cartService.listCartItems(mbInfoId, cartTypeCd);
// 카트 목록 자료에 대한 상세자료 설정
collectionService.setDetailInfoForList(list, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small"));
collectionService.setDetailInfoForList(list, getMbInfoId(request));
// 카트 건수
cartTypeCd1Cnt = cartService.countCartItems(mbInfoId, "1");

2
src/main/java/nlib/col/web/InterestController.java
View File

@ -137,7 +137,7 @@ public class InterestController extends NlibCommonController
totalCount = interestService.countListInterests(searchCollectionVO);
String mbInfoId = getMbInfoId(request);
operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small"));
operList = collectionService.setDetailInfoForList(interestList, getMbInfoId(request));
//-------------------------------
// JSON변환 응답 처리
//-------------------------------

9
src/main/java/nlib/col/web/ReadController.java
View File

@ -89,8 +89,13 @@ public class ReadController extends NlibCommonController {
String selItems = readVO.getSelItems();
List<CollectionVO> list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId, NlibProperty.getString("thumbnail.image.url.small"));
List<CollectionVO> list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId);
List<HashMap<String, String>> listDates = readService.listDates();
if(StringUtil.isEmpty(readVO.getMngOrgNm()) && list != null && list.size() > 0) {
readVO.setMngOrgCd(list.get(0).getMngOrgCd());
readVO.setMngOrgNm(list.get(0).getMngOrgNm());
}
model.addAttribute("readVO", readVO);
model.addAttribute("list", list);
@ -153,7 +158,7 @@ public class ReadController extends NlibCommonController {
List<CollectionVO> list = collectionService.makeListOfCollectionVO(selItems);
list = readService.insertReadItems(list, mbInfoId, readVO, fromCart);
list = collectionService.setDetailInfoForList(list, mbInfoId, NlibProperty.getString("thumbnail.image.url.small"));
list = collectionService.setDetailInfoForList(list, mbInfoId);
model.addAttribute("readVO", readVO);
model.addAttribute("list", list);

9
src/main/java/nlib/col/web/RentController.java
View File

@ -236,7 +236,12 @@ public class RentController extends NlibCommonController
String selItems = rentVO.getSelItems();
List<CollectionVO> list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId, NlibProperty.getString("thumbnail.image.url.small"));
List<CollectionVO> list = collectionService.makeInfoListOfCollectionVO(selItems, mbInfoId);
if(StringUtil.isEmpty(rentVO.getMngOrgNm()) && list != null && list.size() > 0) {
rentVO.setMngOrgCd(list.get(0).getMngOrgCd());
rentVO.setMngOrgNm(list.get(0).getMngOrgNm());
}
model.addAttribute("rentVO", rentVO);
model.addAttribute("list", list);
@ -273,7 +278,7 @@ public class RentController extends NlibCommonController
List<CollectionVO> list = collectionService.makeListOfCollectionVO(selItems);
list = rentService.insertRentItems(list, mbInfoId, rentVO.getMngOrgCd(), fromCart);
list = collectionService.setDetailInfoForList(list, mbInfoId, NlibProperty.getString("thumbnail.image.url.small"));
list = collectionService.setDetailInfoForList(list, mbInfoId);
model.addAttribute("rentVO", rentVO);
model.addAttribute("list", list);

8
src/main/java/nlib/sch/service/NlibSearchVO.java
View File

@ -48,6 +48,7 @@ public class NlibSearchVO extends PagingVO {
private String typeDivCd = ""; //자료유형
private String subjectCode = ""; //주제분야
private String orgNm = ""; //생산기관
private String mngOrgCd = ""; //문화원코드
private String reQuery = ""; //결과내 재검색
private String reQueryChk ="query"; //결과내재검색 체크 유지
@ -354,6 +355,7 @@ public class NlibSearchVO extends PagingVO {
add(map,"DTLS_TYPE_DIV_CD",URLEncoder.encode(StringUtil.getString(this.second_class,"").replace(",","|") , "UTF-8"));
add(map,"SUBJECT_CODE",URLEncoder.encode(StringUtil.getString(this.second_category,"").replace(",","|") , "UTF-8"));
add(map,"ORG_NM",URLEncoder.encode(StringUtil.getString(this.filter_agency,"").replace(",","|") , "UTF-8"));
add(map,"MNG_ORG_CD",URLEncoder.encode(this.mngOrgCd , "UTF-8")); //자료유형 2뎁스까지 나오게 고정
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@ -405,4 +407,10 @@ public class NlibSearchVO extends PagingVO {
public void setCollectionList(String collectionList) {
this.collectionList = collectionList;
}
public String getMngOrgCd() {
return mngOrgCd;
}
public void setMngOrgCd(String mngOrgCd) {
this.mngOrgCd = mngOrgCd;
}
}

40
src/main/java/nlib/sch/web/NlibSearchController.java
View File

@ -91,9 +91,12 @@ public class NlibSearchController extends NlibCommonController {
, @ModelAttribute("searchVO") NlibSearchVO searchVO
, HttpServletRequest request
, HttpServletResponse res) throws Exception {
//사용자 정보를 가져온다.
NlibLoginVO loginVO = getNlibLoginVO(authentication);
HttpSession session = request.getSession();
String councilCd = (String)session.getAttribute("councilCd");
//검색엔진파라미터로 문화원코드
searchVO.setMngOrgCd(councilCd);
List<CollectionVO> operList = new ArrayList();
// 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM)
List<Map<String,String>> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION");
@ -124,10 +127,10 @@ public class NlibSearchController extends NlibCommonController {
if(StringUtil.isEmpty(mbInfoId)) {
// 검색엔진에서 받아온 masterId로 상세정보 조회
operList = collectionService.setDetailInfoForList(searchVO.getResultList(), null, NlibProperty.getString("thumbnail.image.url.small"));
operList = collectionService.setDetailInfoForList(searchVO.getResultList(), null);
} else {
// 검색엔진에서 받아온 masterId로 상세정보 조회
operList = collectionService.setDetailInfoForList(searchVO.getResultList(), getMbInfoId(request), NlibProperty.getString("thumbnail.image.url.small"));
operList = collectionService.setDetailInfoForList(searchVO.getResultList(), getMbInfoId(request));
}
//결과 데이터 담기
@ -157,7 +160,6 @@ public class NlibSearchController extends NlibCommonController {
count = 0;
for(int j=0; j<subject.size(); j++)
{
//if(String.valueOf(clsf.get(i).get("CLSF_ID")).equals(String.valueOf(subject.get(j).get("category_nm"))))
if(String.valueOf(clsf.get(i).get("clsfId")).equals(String.valueOf(subject.get(j).get("category_nm"))))
{
count += Integer.parseInt(subject.get(j).get("category_cnt"));
@ -186,7 +188,7 @@ public class NlibSearchController extends NlibCommonController {
count = 0;
for(int j=0; j<type.size(); j++)
{
if(String.valueOf(secondClassList.get(i).get("column1")).equals(String.valueOf(type.get(j).get("class_nm"))))
if(String.valueOf(secondClassList.get(i).get("sCodeId")).equals(String.valueOf(type.get(j).get("class_nm"))))
{
count += Integer.parseInt(type.get(j).get("class_cnt"));
}
@ -202,10 +204,6 @@ public class NlibSearchController extends NlibCommonController {
model.addAttribute("firstClassList", firstClassList);
model.addAttribute("secondClassList", secondClassList);
//로그인 상태인지 확인
model.addAttribute("loginVO", loginVO);
model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri"));
searchVO.setQuery(searchVO.getQuery().replaceAll("\\\"", "&quot;"));
return "nlib/collection/searchList";
}
@ -263,7 +261,6 @@ public class NlibSearchController extends NlibCommonController {
) throws Exception {
HttpSession session = request.getSession();
String masterId = request.getParameter("masterId");
String mbInfoId = getMbInfoId(request);
List<String> mngOrgList = new ArrayList<>();
List<String> keywordList = new ArrayList<>();
@ -272,12 +269,17 @@ public class NlibSearchController extends NlibCommonController {
CollectionVO vo = new CollectionVO();
vo.setMasterId(masterId);
vo.setMbInfoId(mbInfoId);
vo = collectionService.getItemInfo(vo);
if(vo == null)
{
model.addAttribute("msg", "해당 자료를 조회할 수 없습니다.\\n관리자에게 문의하여 주시기 바랍니다.");
model.addAttribute("url","/search/searchList.do");
return "nlib/cmm/alert";
}
String councilCd = (String)session.getAttribute("councilCd");
vo.setMngOrgCd(councilCd);
//함께 볼만한 자료
List<CollectionVO> seeTogetherListVO = collectionService.selectSeeTogetherList(vo);
@ -319,8 +321,6 @@ public class NlibSearchController extends NlibCommonController {
model.addAttribute("keywordList",keywordList);
model.addAttribute("result", vo);
model.addAttribute("searchVO", searchVO);
model.addAttribute("loginVO", loginVO);
model.addAttribute("pdfUri", NlibProperty.getProperty("pdf.uri"));
return "nlib/collection/searchItemDetail";
}
@ -393,16 +393,10 @@ public class NlibSearchController extends NlibCommonController {
public String getDetailedSearchFormPopup(HttpServletRequest request, ModelMap model) throws Exception {
//주제분야 목록 조회
List<Map<String,String>> clsf = null;
clsf = codeService.listCtClsfs();
List<Map<String,String>> clsf = codeService.listCtClsfs();
model.addAttribute("firstCategoryList", clsf);
model.addAttribute("secondCategoryList", clsf);
List<Map<String,String>> firstClassList = null;
firstClassList = codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD);
List<Map<String,String>> secondClassList = null;
secondClassList = codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD);
//자료유형
model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD));
model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD));

2
src/main/java/nlib/user/web/LoginController.java
View File

@ -675,7 +675,7 @@ public class LoginController extends NlibCommonController {
if(ret < 1) {
model.addAttribute("code", "NO_TARGET");
model.addAttribute("message", "휴면사용자가 아닙니다. 다시 로그인하시거나 관리자에게 문의하여 주시기 바랍니다.");
model.addAttribute("message", "휴면사용자가 아닙니다. \\n다시 로그인하시거나 관리자에게 문의하여 주시기 바랍니다.");
return "nlib/login/activateDormantAccForm";
}

2
src/main/java/nlib/user/web/MemberController.java
View File

@ -503,7 +503,7 @@ public class MemberController extends NlibCommonController{
if(result == "templateFail")
{
map.put("msg","이메일 발송에 실패하였습니다. 관리자에게 문의하여 주시기 바랍니다.");
map.put("msg","이메일 발송에 실패하였습니다. \\n관리자에게 문의하여 주시기 바랍니다.");
map.put("emailCertYn","N");
return map;
}

10
src/main/java/nlib/user/web/UserInfoController.java
View File

@ -132,7 +132,7 @@ public class UserInfoController extends NlibCommonController {
if(loginVO == null)
{
model.addAttribute("msg","비정상적인 접근입니다. 관리자에게 문의하여 주시기 바랍니다.");
model.addAttribute("msg","비정상적인 접근입니다. \\n관리자에게 문의하여 주시기 바랍니다.");
model.addAttribute("url","/userInfo/pwCertMyInfo.do");
return "nlib/cmm/alert";
}
@ -142,7 +142,7 @@ public class UserInfoController extends NlibCommonController {
loginVO = loginService.selectLoginUserInfo(loginVO);
if(loginVO == null)
{
model.addAttribute("msg","비정상적인 접근입니다. 관리자에게 문의하여 주시기 바랍니다.");
model.addAttribute("msg","비정상적인 접근입니다. \\n관리자에게 문의하여 주시기 바랍니다.");
model.addAttribute("url","/userInfo/pwCertMyInfo.do");
return "nlib/cmm/alert";
}
@ -352,7 +352,7 @@ public class UserInfoController extends NlibCommonController {
List<CollectionVO> interestList = interestService.listInterests(searchCollectionVO);
int interestTotalCount = interestService.countListInterests(searchCollectionVO);
interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small"));
interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId());
model.addAttribute("interestList", interestList);
model.addAttribute("interestTotalCount", interestTotalCount);
@ -361,14 +361,14 @@ public class UserInfoController extends NlibCommonController {
// 조회
// 대출상태구분코드("": 전체, A:신청, B:대출준비완료, C:취소, W:대출중, R0:정상반납, R1:연체반납, P:연체)
DataApiResVO resRentVO = rentService.listRentItems(searchCollectionVO);
List<CollectionVO> rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small"));
List<CollectionVO> rentList = collectionService.setDetailInfoForHashList(resRentVO.getRecordList(), searchCollectionVO.getMbInfoId());
model.addAttribute("rentList", rentList);
model.addAttribute("rentTotalCount", resRentVO.getRecordTotCount());
// 방문열람내역 (최근 5개)
searchCollectionVO.setReqStatusDivCd(null);
DataApiResVO resReadVO = readService.listReadItems(searchCollectionVO);
List<CollectionVO> readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small"));
List<CollectionVO> readList = collectionService.setDetailInfoForHashList(resReadVO.getRecordList(), searchCollectionVO.getMbInfoId());
model.addAttribute("readList", readList);
model.addAttribute("readTotalCount", resReadVO.getRecordTotCount());

4
src/main/resources/egovframework/mapper/nlib/bbs/AncmntDAO_SQL.xml
View File

@ -18,7 +18,7 @@
</if>
<if test='searchType != null and searchType.equals("C")'>
<if test="searchKeyword != null and !searchKeyword.equals('')">
AND IFNULL(S.CONTENT,'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
AND IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),'') LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
</if>
</if>
AND IFNULL(S.DELETE_YN, 'N') = 'N'
@ -71,7 +71,7 @@
, A.MNG_ORG_CD
, B.DEPT_NM AS MNG_ORG_NM
, A.TITLE
, A.CONTENT
, CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT
, IF(IFNULL(A.NOTI_YN, 'N') = '', 'N', A.NOTI_YN) AS NOTI_YN
, A.OPEN_YN
, A.POST_START_DATE

6
src/main/resources/egovframework/mapper/nlib/bbs/FaqDAO_SQL.xml
View File

@ -19,7 +19,7 @@
</if>
<if test='searchType != null and searchType.equals("C")'>
<if test="searchKeyword != null and !searchKeyword.equals('')">
AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
</if>
</if>
<if test='searchQuestionType != null and !searchQuestionType.equals("")'>
@ -80,9 +80,9 @@
, A.QUESTION_TYPE
, D.S_CODE_NM AS QUESTION_TYPE_NAME
, A.TITLE
, A.CONTENT
, CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT
, IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN
, A.ANSWER
, CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER
, IFNULL(A.USE_YN, 'Y') AS USE_YN
, A.VIEW_CNT
, A.BD_ATTACH_FILE_ID

12
src/main/resources/egovframework/mapper/nlib/bbs/QnaDAO_SQL.xml
View File

@ -18,7 +18,7 @@
</if>
<if test='searchType != null and searchType.equals("C")'>
<if test="searchKeyword != null and !searchKeyword.equals('')">
AND CONCAT(IFNULL(S.CONTENT,''), IFNULL(S.ANSWER,'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
AND CONCAT(IFNULL(CONVERT(S.CONTENT_LBL USING UTF8),''), IFNULL(CONVERT(S.ANSWER_LBL USING UTF8),'')) LIKE CONCAT('%', #{escapeSearchKeyword}, '%')
</if>
</if>
<if test='searchMbInfoId != null and !searchMbInfoId.equals("")'>
@ -86,10 +86,10 @@
, B.DEPT_NM AS MNG_ORG_NM
, A.QUESTION_TYPE
, A.TITLE
, A.CONTENT
, CONVERT(A.CONTENT_LBL USING UTF8) AS CONTENT
, IFNULL(A.ANSWER_YN, 'N') AS ANSWER_YN
, IFNULL(A.EMAIL_RECV_YN, 'N') AS EMAIL_RECV_YN
, A.ANSWER
, CONVERT(A.ANSWER_LBL USING UTF8) AS ANSWER
, IFNULL(A.USE_YN, 'Y') AS USE_YN
, IFNULL(A.SECRET_YN, 'N') AS SECRET_YN
, A.VIEW_CNT
@ -138,9 +138,9 @@
, BD_TYPE
, QUESTION_TYPE
, TITLE
, CONTENT
, CONTENT_LBL
, ANSWER_YN
, ANSWER
, ANSWER_LBL
, EMAIL_RECV_YN
, SECRET_YN
, USE_YN
@ -174,7 +174,7 @@
/* QNA : updateArticle : 삭제되지 않은 건 중 답변이 아직 없는 건에 한하여 수정 가능 */
UPDATE BD_NLIB_QNA
SET TITLE = #{title}
, CONTENT = #{content}
, CONTENT_LBL = #{content}
, EMAIL_RECV_YN = #{emailRecvYn}
, SECRET_YN = #{secretYn}
, BD_ATTACH_FILE_ID = #{bdAttachFileId}

46
src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml
View File

@ -86,21 +86,6 @@
AND IFNULL(M2.PE_STATUS, '') = '' /* 보존상태 */
ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC
LIMIT 10 )
UNION
(/* DDDDDDDDDDDDDDDDDDDDDDDDDDDD 테스트 확인용 */
SELECT
2 AS RNK
, M2.MASTER_ID
, M2.TITLE
, M2.TYPE_DIV_CD
, TDC.S_CODE_NM AS TYPE_DIV_NM
, M2.RPRS_THUMB_URL
, M2.REG_DD
, M2.MOD_DD
FROM RG_MASTER M2
JOIN SM_CODE_S TDC ON M2.TYPE_DIV_CD = TDC.S_CODE_ID AND TDC.L_CODE_ID = 'MASTER_TYPE_DIV_CD'
ORDER BY M2.MOD_DD DESC, M2.REG_DD DESC
LIMIT 2 )
) T
ORDER BY RNK, T.MOD_DD DESC, T.REG_DD DESC
LIMIT 10
@ -156,7 +141,7 @@
<!-- 온라인자료관 -->
<select id="listOnline" parameterType="String" resultType="CollectionVO">
<![CDATA[
(SELECT
SELECT
M.MASTER_ID
, M.TITLE
, M.TYPE_DIV_CD
@ -188,34 +173,7 @@
AND IFNULL(M.M_INTERFACE_ID, '') != '' /* IF존재하는 건 */
AND IFNULL(M.RPRS_THUMB_URL, '') != '' /* 썸네일 존재하는 자료에 한정 : 2021.11.15 엑티버 김혜준대리 내부근무 과장님통해 요청 */
ORDER BY M.MOD_DD DESC, M.REG_DD DESC
LIMIT 10)
UNION
(/* DDDDDDDDDDDDDDDDDDDDDDDDDDDD 테스트 확인용 */
SELECT
M.MASTER_ID
, M.TITLE
, M.TYPE_DIV_CD
, C1.S_CODE_NM AS TYPE_DIV_NM
, M.DTLS_TYPE_DIV_CD
, C2.S_CODE_NM DTLS_TYPE_DIV_NM
, M.SUBJECT_CODE
, ( 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, '') 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'
ORDER BY M.MOD_DD DESC, M.REG_DD DESC
LIMIT 3)
LIMIT 10
]]>
</select>

1
src/main/resources/egovframework/mapper/nlib/info/InformDAO_SQL.xml
View File

@ -10,7 +10,6 @@
, MNG_ORG_CD
, TITLE
, CONTENT
, BD_ATTACH_FILE_ATTACH_FILE_ID
FROM BD_NLIB_CONTENT_PAGE A
WHERE A.CONTENT_TYPE = #{contentType}
AND A.MNG_ORG_CD = #{mngOrgCd}

1
src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp
View File

@ -223,7 +223,6 @@
<ul class="list-notice">
<li class="t-tit-line">
<span class="t-num">NO</span>
<span class="t-type"></span>
<span class="t-tit">제목</span>
<span class="t-writer">등록자</span>
<span class="t-date">등록일</span>

74
src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
View File

@ -86,9 +86,47 @@ function fn_listPops(typeDivCd) {
<h2 class="blind">배너 섹션영역</h2>
<div class="inner">
<div class="banner">
<h3>온라인 대출/알람예약 서비스를 통해<br>문화원 소장자료들을 만나보세요.</h3>
<p>자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!<br>온라인에서 쉽고 간편하게 할 수 있습니다.</p>
</div>
<!-- Swiper -->
<div class="swiper MainSwiper">
<ul class="swiper-wrapper">
<li class="swiper-slide">
<div class="img"><img src="/images/bg/bg-mainbanner.jpg" alt="슬라이드 이미지 1"></div>
<div class="text">
<h3>온라인 대출/알람예약 서비스를 통해<br>문화원 소장자료들을 만나보세요.</h3>
<p>자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!<br>온라인에서 쉽고 간편하게 할 수 있습니다.</p>
<p><a href="#" class="eff">자세히 보기 &#62;</a></p>
</div>
</li>
<li class="swiper-slide">
<div class="img"><img src="/images/bg/bg-mainbanner.jpg" alt="슬라이드 이미지 1"></div>
<div class="text">
<h3>온라인 대출/알람예약 서비스를 통해<br>문화원 소장자료들을 만나보세요.</h3>
<p>자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!<br>온라인에서 쉽고 간편하게 할 수 있습니다.</p>
<p><a href="#" class="eff">자세히 보기 &#62;</a></p>
</div>
</li>
<li class="swiper-slide">
<div class="img"><img src="/images/bg/bg-mainbanner.jpg" alt="슬라이드 이미지 1"></div>
<div class="text">
<h3>온라인 대출/알람예약 서비스를 통해<br>문화원 소장자료들을 만나보세요.</h3>
<p>자료 검색을 통해 원하는 자료를 찾고, 대출/열람 예약 신청까지!<br>온라인에서 쉽고 간편하게 할 수 있습니다.</p>
<p><a href="#" class="eff">자세히 보기 &#62;</a></p>
</div>
</li>
</ul>
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
<div class="pagination">
<div class="swiper-pagination"></div>
<div class="loop-count">
<canvas id="swieper-timer" width="32" height="32"></canvas>
<button class="remote"><span></span></button>
</div>
</div>
</div>
</div>
<div class="color-box">
<div class="list">
<a href="javascript:void(0);" onclick="location.href = '/inform/selectNCultureOperationInfo.do';" title="이용안내">
@ -337,6 +375,36 @@ function fn_listPops(typeDivCd) {
<script>
/* 메인슬라이드 */
var myswiper = new Swiper(".MainSwiper", {
loop: true,
slidesPerView: 1,
spaceBetween: 0,
centeredSlides: true,
autoplay: {
delay: 4000,
disableOnInteraction: false,
},
navigation: {
nextEl: ".swiper-button-next",
prevEl: ".swiper-button-prev",
},
pagination: {
el: '.pagination .swiper-pagination',
type: 'fraction',
}
});
$('.remote').click(function () {
if($(this).hasClass('restart')){
$(this).removeClass('restart');
myswiper.autoplay.start();
}else{
$(this).addClass('restart');
myswiper.autoplay.stop();
}
});
var windowWidth = $(window).width();
var _slidesPerView = 5;
var _spaceBetween = 30;

16
src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
View File

@ -154,10 +154,11 @@
$( "div.list-data").empty();
var t_title = "";
t_title += "<div class=\"list t-tit-line\">"
t_title += "<div class=\"t-chk\"><label for=\"allChk\" style=\"display:none;\">전체 체크</label><input type=\"checkbox\" id=\"allChk\" onclick=\"selectAllChk();\"></div>"
t_title += "<div class=\"t-cultural\">문화원</div>"
t_title += "<div class=\"t-data\">자료정보</div>"
t_title += "<div class=\"t-btn\">이용</div>"
t_title += "<div class=\"t-chk\"><label for=\"allChk\" style=\"display:none;\">전체 체크</label><input type=\"checkbox\" id=\"allChk\" onclick=\"selectAllChk();\"><span class=\"mo-ver\"><strong>전체선택</strong> (3/3)</span></div>"
t_title += "<div class=\"t-cultural t-mo\">문화원</div>"
t_title += "<div class=\"t-data t-mo\">자료정보</div>"
t_title += "<div class=\"t-btn t-mo\">이용</div>"
t_title += "<div class=\"t-delete mo-ver\">선택삭제</div>"
t_title += "</div>"
t_title += "<li class=\"no-result\" style=\"display:none;\">"
t_title += "<span>검색결과가 없습니다.</span>"
@ -212,7 +213,6 @@
}
t_data += "</span>"
t_data += "&nbsp;&nbsp;|&nbsp;&nbsp;"
t_data += "<span>주제분야 : "
if(!fn_isEmpty(obj.subjectNmUp)){
t_data += obj.subjectNmUp
@ -228,7 +228,6 @@
}
t_data += "</span>"
t_data += "&nbsp;&nbsp;|&nbsp;&nbsp;"
t_data += "<span>생산기관 : "
if(!fn_isEmpty(obj.orgNm)){
t_data += obj.orgNm
@ -237,7 +236,6 @@
}
t_data += "</span>"
t_data += "&nbsp;&nbsp;|&nbsp;&nbsp;"
t_data += "<span>생산년도 : "
if(!fn_isEmpty(obj.creatYyyy)){
t_data += obj.creatYyyy
@ -252,10 +250,10 @@
//대출, 방문 가능여부
if(!fn_isEmpty(obj.operOutRangeNm) && !fn_isEmpty(obj.operReadRangeNm))
{
t_btn +="<p>" + obj.operOutRangeNm + "<br>" + obj.operReadRangeNm + "</p>";
t_btn +="<div>" + obj.operOutRangeNm + "</div>" + "<div>" + obj.operReadRangeNm + "</div>";
}else if(!fn_isEmpty(obj.operOutRangeNm) || !fn_isEmpty(obj.operReadRangeNm))
{
t_btn +="<p>" + obj.operOutRangeNm + obj.operReadRangeNm + "</p>";
t_btn +="<div>" + obj.operOutRangeNm + obj.operReadRangeNm + "</div>";
}
if(obj.ableOnline)
{

1034
src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
View File

File diff suppressed because it is too large Load Diff

6
src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp
View File

@ -67,7 +67,7 @@ function goFindPw(){
mailDoubleSubmitFlag = false;
if(result == "success")
{
alert("입력하신 이메일로 임시 비밀번호가 발송되었습니다. 메일을 확인해주세요.");
alert("입력하신 이메일로 임시 비밀번호가 발송되었습니다.\n메일을 확인해주세요.");
var previousPage ="${loginVO.previousPage}";
if(previousPage == "alreadySignUpPopup")
{
@ -84,12 +84,12 @@ function goFindPw(){
}
else if(result == "templateFail")
{
alert("이메일 발송에 실패하였습니다. 관리자에게 문의하여 주시기 바랍니다.");
alert("이메일 발송에 실패하였습니다. \n관리자에게 문의하여 주시기 바랍니다.");
}
},error : function(){
mailDoubleSubmitFlag = false;
alert("이메일 발송에 실패하였습니다. 관리자에게 문의하여 주시기 바랍니다.");
alert("이메일 발송에 실패하였습니다. \n관리자에게 문의하여 주시기 바랍니다.");
}
})

40
src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp
View File

@ -1,9 +1,9 @@
<%
/**
* <pre>
* @Class Name : confirmRent.jsp
* @Class Name : insertRentItems.jsp
*
* @Description : 대출신청 확인 화면
* @Description : 대출신청 결과 화면
*
*
* @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021)
@ -194,29 +194,29 @@ $(document).ready(function() {
<!-- 행 : 시작 -->
<div class="list">
<div class="t-data">
<div class="img"><a href="javascript:void(0)"><img src="${rent.rprsThumbUrl }" alt="썸네일" width="60" height="91" title="상세보기" onclick="fn_gotoDetail('${rent.masterId }')"></a>
<c:if test='${cart.MUseYn == "Y"}'>
<span class="favorites" onclick="fn_changeInterest('${rent.masterId }', 'off')" title="관심자료에서 삭제합니다.">
<div class="img"><a href="javascript:void(0)"><img src="${rent.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="fn_gotoDetail('${rent.masterId }')"></a>
<c:if test='${rent.MUseYn == "Y"}'>
<span id="favorites_${rent.masterId}" class="favorites" onclick="fn_changeInterest('${rent.masterId }', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘">
</span>
</c:if>
<c:if test='${rent.MUseYn != "Y"}'>
<span class="favorites" onclick="fn_changeInterest('${rent.masterId }', 'on')" title="관심자료로 등록합니다.">
<span id="favorites_${rent.masterId}" class="favorites" onclick="fn_changeInterest('${rent.masterId }', 'on')" title="관심자료로 등록합니다.">
<img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
</span>
</c:if> </div>
<div class="type">
<c:if test="${rent.openDivCd != '3' }">
<c:if test="${rent.ableOnline}">
<span class="online">온라인열람</span>
</c:if>
<c:if test="${rent.operOutRangeCd == '01' }">
<c:if test="${rent.ableRent}">
<span class="loan">대출</span>
</c:if>
<c:if test="${rent.operReadRangeCd != '03' }">
<c:if test="${rent.ableRead }">
<span class="visit">방문열람</span>
</c:if>
</div>
@ -230,14 +230,22 @@ $(document).ready(function() {
</c:if>
</div>
<div class="t-visit long">
<c:if test='${rent.bookLtRvStatusCd != "1" }'>
<c:if test='${rent.rsrvDivCd == "1" }'>
대출신청 자료는 신청 다음날까지 방문대출이 가능합니다.
<c:set var="rentType1Cnt" value="${rentType1Cnt+1}" />
</c:if>
<c:if test='${rent.bookLtRvStatusCd != "2" }'>
<c:if test='${rent.rsrvDivCd == "2" }'>
대출예약 자료는 반납 즉시 문자(SMS)나 이메일로 안내 드립니다.
<c:set var="rentType2Cnt" value="${rentType2Cnt+1}" />
</c:if>
<c:if test='${rent.rsrvDivCd != "1" and rent.rsrvDivCd != "2" }'>
<c:if test='${not empty rent.resultMessage }'>
${rent.resultMessage }
</c:if>
<c:if test='${empty rent.resultMessage }'>
잘못된 접근이거나, 정상처리되지 않았습니다.
</c:if>
</c:if>
</div>
</div>
@ -250,7 +258,15 @@ $(document).ready(function() {
<div class="compl-box">
<div class="compl-icon"><img src="/images/icon/icon-cart-com.png" alt="체크 아이콘"></div>
<div class="compl-text">자료 <span>${rentType1Cnt }</span>건 대출신청, 자료 <span>${rentType2Cnt }</span>건 대출예약이 <span>완료</span>되었습니다.</div>
<div class="compl-text">
<c:if test='${(rentType1Cnt + rentType2Cnt) > 0 }'>
<c:if test='${rentType1Cnt > 0 }'>
자료 <span>${rentType1Cnt }</span>건 대출신청</c:if><c:if test='${rentType1Cnt > 0 and rentType2Cnt > 0 }'>,</c:if><c:if test='${rentType2Cnt > 0 }'>
자료 <span>${rentType2Cnt }</span>건 대출예약</c:if>이 <span>완료</span>되었습니다.</div>
</c:if>
<c:if test='${(rentType1Cnt + rentType2Cnt) < 1 }'>
<span>처리 내역이 없습니다.</span>
</c:if>
</div>
<script>

53
src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp
View File

@ -147,12 +147,22 @@
<a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')"><img src="${item.rprsThumbUrlWithDefaultSmall }" width="130" height="196" alt="썸네일"></a>
</div>
<div class="text">
<div class="ti">${item.title }</div>
<div class="ti"><a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')">${item.title }</a></div>
<div class="cl">
<p class="typ"><span>자료유형 :</span><span>${item.typeDivNm } <c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm }</span></p>
<p class="sub"><span>주제분야 :</span><span>${item.subjectNmUp } <c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm }</span></p>
<p class="age"><span>생산기관 :</span><span>${item.orgNm }</span></p>
<p class="yea"><span>생산년도 :</span><span>${item.creatYyyy }</span></p>
<p class="typ"><span>자료유형 :</span><span>${item.typeDivNm }
<c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm }
<c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if>
</span></p>
<p class="sub"><span>주제분야 :</span><span>${item.subjectNmUp }
<c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm }
<c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if>
</span></p>
<p class="age"><span>생산기관 :</span><span>${item.orgNm }
<c:if test="${empty item.orgNm }">-</c:if>
</span></p>
<p class="yea"><span>생산년도 :</span><span>${item.creatYyyy }
<c:if test="${empty item.creatYyyy }">-</c:if>
</span></p>
</div>
</div>
</div>
@ -178,12 +188,18 @@
<p>[${item.mngOrgNm }]</p>
</div>
<div class="con">
<p>${item.title }</p>
<p><a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')">${item.title }</a></p>
<p>
<span><em>자료유형 : </em> ${item.typeDivNm } <c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm }</span>
<span><em>주제분야 : </em> ${item.subjectNmUp } <c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm }</span>
<span><em>생산기관 : </em> ${item.orgNm }</span>
<span><em>생산년도 : </em> ${item.creatYyyy }</span>
<span><em>자료유형 : </em> ${item.typeDivNm }
<c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm }
<c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if>
</span>
<span><em>주제분야 : </em> ${item.subjectNmUp }
<c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm }
<c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if>
</span>
<span><em>생산기관 : </em> ${item.orgNm } <c:if test="${empty item.orgNm }">-</c:if></span>
<span><em>생산년도 : </em> ${item.creatYyyy } <c:if test="${empty item.creatYyyy }">-</c:if></span>
</p>
</div>
<div class="state">
@ -218,12 +234,18 @@
<p>[${item.mngOrgNm }]</p>
</div>
<div class="con">
<p>${item.title }</p>
<p><a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')">${item.title }</a></p>
<p>
<span><em>자료유형 : </em> ${item.typeDivNm } <c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm }</span>
<span><em>주제분야 : </em> ${item.subjectNmUp } <c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm }</span>
<span><em>생산기관 : </em> ${item.orgNm }</span>
<span><em>생산년도 : </em> ${item.creatYyyy }</span>
<span><em>자료유형 : </em> ${item.typeDivNm }
<c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm }
<c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if>
</span>
<span><em>주제분야 : </em> ${item.subjectNmUp }
<c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm }
<c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if>
</span>
<span><em>생산기관 : </em> ${item.orgNm } <c:if test="${empty item.orgNm }">-</c:if></span>
<span><em>생산년도 : </em> ${item.creatYyyy } <c:if test="${empty item.creatYyyy }">-</c:if></span>
</p>
</div>
<div class="state">
@ -250,4 +272,5 @@
</div>
</div>

38
src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
View File

@ -463,6 +463,32 @@ function checkBirthday() {
}
}
jQuery(function ($) {
var now = new Date();
var year = now.getFullYear();
var mon = now.getMonth() + 1 > 9 ? "" + (now.getMonth() + 1) : "0" + (now.getMonth() + 1);
var day = now.getDate() > 9 ? "" + now.getDate() : "0" + now.getDate();
// 년도
for (var i = 1900; i <= year; i++) {
$("#birth_yy").append('<option value="' + i + '">' + i + "년</option>");
}
// 월별
for (var i = 1; i <= 12; i++) {
var mm = i > 9 ? i : "0" + i;
$("#birth_mm").append('<option value="' + mm + '">' + mm + "월</option>");
}
// 일별
for (var i = 1; i <= 31; i++) {
var dd = i > 9 ? i : "0" + i;
$("#birth_dd").append('<option value="' + dd + '">' + dd + "일</option>");
}
$("#birth_yy > option[value=" + year + "]").attr("selected", "true");
$("#birth_mm > option[value=" + mon + "]").attr("selected", "true");
$("#birth_dd > option[value=" + day + "]").attr("selected", "true");
});
function isValidDate(param) {
try {
param = param.replace(/-/g, '');
@ -598,9 +624,9 @@ function snsUnlink(snsId){
<div class="form-group Userbirth">
<label>생년월일</label>
<div class="con">
<label for="birth_yy" style="display:none;">년</label><select name="birth_yy" id="birth_yy"></select>
<label for="birth_mm" style="display:none;">월</label><select name="birth_mm" id="birth_mm"></select>
<label for="birth_dd" style="display:none;">일</label><select name="birth_dd" id="birth_dd"></select>
<label for="birth_yy" style="display:none;">년</label><select name="birth_yy" id="birth_yy"></select>년
<label for="birth_mm" style="display:none;">월</label><select name="birth_mm" id="birth_mm"></select>월
<label for="birth_dd" style="display:none;">일</label><select name="birth_dd" id="birth_dd"></select>일
</div>
</div>
@ -680,13 +706,15 @@ function snsUnlink(snsId){
<div class="form-group service">
<div class="left">
<div class="chk"><input type="checkbox" id="service-chk1" class="ser-chk1" <c:if test="${loginVO.infoRecvSmsYn eq 'Y' and loginVO.infoRecvEmailYn eq 'Y' }">checked </c:if>><label for="service-chk1">대출/열람 정보 수신동의 [필수/1건 이상 선택]</label></div>
<div class="chk"><input type="checkbox" id="service-chk1" class="ser-chk1" <c:if test="${loginVO.infoRecvSmsYn eq 'Y' and loginVO.infoRecvEmailYn eq 'Y' }">checked </c:if>><label for="service-chk1">대출/열람 정보 수신동의 [필수]</label></div>
</div>
<!--
<div class="right">
<div class="chk"><input type="checkbox" id="service-chk1-1" class="ser-chk1-1" name="infoRecvSmsYnChk" <c:if test="${loginVO.infoRecvSmsYn eq 'Y' }">checked </c:if>><label for="service-chk1-1">문자(SMS)</label></div>
<div class="chk"><input type="checkbox" id="service-chk1-2" class="ser-chk1-1" name="infoRecvEmailYnChk" <c:if test="${loginVO.infoRecvEmailYn eq 'Y' }">checked </c:if>><label for="service-chk1-2">이메일</label></div>
</div>
<p class="bg">- 문자(SMS)/이메일 수신동의를 하시면 ‘자료반납’, ‘자료연체’, ‘예약자료 도착’, ‘열람신청 승인’, ‘열람신청 반려’ 알림을 받으실 수 있습니다.</p>
-->
<p class="bg">※ 수신동의를 하시면 ‘자료반납’, ‘자료연체’, ‘예약자료 도착’, ‘열람신청 승인’, ‘열람신청 반려’ 등 자료이용 관련 알림을 받으실 수 있습니다.</p>
</div>
<div class="form-group service">

2
src/main/webapp/WEB-INF/tiles/inc/footer.jsp
View File

@ -4,7 +4,7 @@
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
<button type="button" id="btn-go-top" class="btn-go-top"><span><img src="/images/icon/icon-arr-top.png" alt="상단 화살표"></span><span>TOP</span></button>
<button type="button" id="btn-go-top" class="mo-go-top btn-go-top"><span><img src="/images/icon/icon-arr-top.png" alt="상단 화살표"></span><span>TOP</span></button>
<div class="inner">
<div class="row-top">
<div class="footer-logo">

4
src/main/webapp/WEB-INF/tiles/inc/menu.jsp
View File

@ -63,7 +63,7 @@ $(document).ready(function() {
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/userInfo/getMyHome.do" title="마이페이지" class="eff" data-reqLogin="true">마이페이지</a>
<ul class="sub-menu">
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/userInfo/pwCertMyInfo.do" title="회원정보관리" data-reqLogin="true"><span class="underline blue">회원정보관리</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/userInfo/getMyHome.do" title="회원정보관리" data-reqLogin="true"><span class="underline blue">회원정보관리</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/interest/listInterests.do" title="관심자료" data-reqLogin="true"><span class="underline blue">관심자료</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/rent/listRentItems.do" title="대출관리" data-reqLogin="true"><span class="underline blue">대출관리</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/read/listReadItems.do" title="방문열람관리" data-reqLogin="true"><span class="underline blue">방문열람관리</span></a></li>
@ -137,7 +137,7 @@ $(document).ready(function() {
<div class="drop_icon"></div>
</div>
<ul class="sub-menu">
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/userInfo/pwCertMyInfo.do" title="회원정보관리" data-reqLogin="true"><span class="underline blue">- 회원정보관리</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/userInfo/getMyHome.do" title="회원정보관리" data-reqLogin="true"><span class="underline blue">- 회원정보관리</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/interest/listInterests.do" title="관심자료" data-reqLogin="true"><span class="underline blue">- 관심자료</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/rent/listRentItems.do" title="대출관리" data-reqLogin="true"><span class="underline blue">- 대출관리</span></a></li>
<li><a href="javascript:void(0)" data-gotoUrl="${pageContext.request.contextPath}/read/listReadItems.do" title="방문열람관리" data-reqLogin="true"><span class="underline blue">- 방문열람관리</span></a></li>

21
src/main/webapp/common/error-throw.jsp
View File

@ -5,10 +5,28 @@
String councilCd = (String)session.getAttribute("councilCd");
String councilNm = (String)session.getAttribute("councilNm");
%>
<!DOCTYPE html>
<html lang="ko">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="format-detection" content="telephone=no" />
<title>소장자료관</title>
<link href="/css/common.css" rel="stylesheet">
<link href="/css/default.css" rel="stylesheet">
<link href="/css/media.css" rel="stylesheet">
<script src="/js/jquery-1.11.2.min.js"></script>
<script src="/js/jquery.mCustomScrollbar.js"></script>
<script src="/js/swiper.min.js"></script>
<script src="/js/default.js"></script>
</head>
<body>
<div class="wrap">
<div class="error">
<div class="text">
<h1><a href="javascript:void(0)" onclick="javascript:location.href='/';"><img src="/images/icon/icon-logo.png" alt="문화원로고"><span class="title"><%=councilNm %></span></a><span class="collection">소장자료관</span></h1>
<p><span>500 ERROR :</span> Service Error</p>
<p>죄송합니다. 현재 서비스가 원활하지 않습니다.</p>
<p><img src="/images/icon/icon-error.png" alt="에러 아이콘"></p>
@ -22,3 +40,6 @@ String councilNm = (String)session.getAttribute("councilNm");
</div>
</div>
</div>
</body>
</html>

1
src/main/webapp/css/common.css
View File

@ -22,6 +22,7 @@ input,select,button{vertical-align:middle;
appearance: none;
*/
}
select {background:#fff;}
button{margin:0;padding:0;}
table{border:none;border-collapse:collapse;padding:0;border-spacing:0;border-color: gray}
a{text-decoration:none;color:#333;}

23
src/main/webapp/css/default.css
View File

@ -155,10 +155,22 @@ section .inner p.desc {font-size: 18px;color:#666;margin-bottom:40px;}
/********** 메인섹션1 **********/
.sec1 {}
.sec1 .inner .banner {position: relative;width:100%;height:600px;background: url(/images/bg/bg-mainbanner.jpg) no-repeat;background-size:cover;}
.sec1 .inner .banner {position: relative;width:100%;height:600px;background:#ccc;background-size:cover;}
.sec1 .inner .banner h3 {font-size:36px;line-height:48px;color:#fff;font-weight: 500;text-align:center;width:100%;position: absolute;top:200px;}
.sec1 .inner .banner p {font-size:16px;line-height:24px;color:#fff;font-weight: 200;text-align:center;width:100%;position: absolute;top:320px;}
.sec1 .inner .color-box {width:960px;margin:0 auto;text-align: center;position: relative;top:-108px;}
.sec1 .inner .banner p:nth-of-type(2) {top:400px;}
.sec1 .inner .banner p:nth-of-type(2) a {border:1px solid #fff;border-radius:50px;color:#fff;font-size:14px;padding:5px 20px;}
.sec1 .inner .banner p:nth-of-type(2) a:hover {border:1px solid #fff;background:#fff;color:#333;}
.MainSwiper .swiper-button-next:after, .MainSwiper .swiper-rtl .swiper-button-prev:after, .MainSwiper .swiper-button-prev:after, .MainSwiper .swiper-rtl .swiper-button-next:after {color:#fff;}
.MainSwiper .loop-count {display: inline-block;position:relative;top:50%;width:36px;height:36px;padding:2px;vertical-align: middle;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
.MainSwiper .loop-count button.remote {background:none !important;position:absolute;left:0;right:0;top:0;bottom:0;width:20px;height:20px;margin:auto;border:2px solid #fff;border-radius:50%;z-index:1;background-size:34px 34px;}
.MainSwiper .loop-count button.remote span {display:block;width:100%;height:100%;background:transparent url('/images/btn/btn-mainvisual-stop-white.png') no-repeat 50% 50%;}
.MainSwiper .loop-count button.remote:focus {outline:none;}
.MainSwiper .loop-count button.remote.restart span {background-image:url('/images/btn/btn-mainvisual-play-white.png');}
.MainSwiper .pagination {position:absolute;bottom:140px;left:calc(50% - -450px);}
.MainSwiper .swiper-pagination-fraction {color:#fff;left:-40px;top:4px;}
.sec1 .inner .color-box {width:960px;margin:0 auto;text-align: center;position: relative;top:-108px;z-index:9;}
.sec1 .inner .color-box .list {float:left;width:25%;height: 216px;background:#333;position: relative;overflow: hidden;}
.sec1 .inner .color-box .list:nth-of-type(1) {background:#f0a233;}
.sec1 .inner .color-box .list:nth-of-type(2) {background:#45a1b0;}
@ -883,7 +895,7 @@ transform: rotate(45deg);}
.data.detail .inner .row-top .center .right .con-2 .de-data ul li span {font-size:14px;color:#fff;}
.data.detail .inner .row-top .center .right .con-2 .de-data ul li span:nth-of-type(1) {font-weight: 400;display:inline-block;margin-right:20px;min-width:70px;}
.data.detail .inner .row-top .center .right .con-2 .de-data ul li span:nth-of-type(2) {font-weight: 200;}
.data.detail .inner .row-top .center .right .con-2 .b-btn {margin:30px 0px 25px;display:inline-block;}
.data.detail .inner .row-top .center .right .con-2 .b-btn {margin:30px 0px 25px;display:inline-block;width:100%;}
.data.detail .inner .row-top .center .right .con-2 .b-btn button {font-size:14px;font-weight: 600;}
.data.detail .inner .row-top .center .right .con-2 .keyword {}
.data.detail .inner .row-top .center .right .con-2 .keyword span {background: #f4f4f4;color:#333;display:inline-block;padding:1px 10px 2px;border-radius: 50px;font-size:12px;}
@ -1135,7 +1147,7 @@ transform: rotate(45deg);}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.title {width:70%;font-size:16px;font-weight: 500;margin:0;height:auto;}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.code {width:70%;font-size:12px;font-weight: 300;margin-bottom: 25px;}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.subject {width:70%;font-size:12px;color:#777;}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.type span {font-size:12px;padding:2px 15px 3px;background:#333;border-radius: 50px;color:#fff;}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.type span {font-size:12px;padding:2px 15px 3px;background:#333;border-radius: 50px;color:#fff;display:inline-block;margin:0px 2px;}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.type span.online {background:#376795;}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.type span.loan {background:#b68946;}
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.type span.visit {background:#2b8b99;}
@ -1311,6 +1323,8 @@ transform: rotate(45deg);}
.list-table-wrap li .t-type {width: 6%;}
.list-table-wrap li .t-tit {text-align: left;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 60%;}
.list-table-wrap li .t-tit a {display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 100%;font-weight: 300;}
.list-table-wrap li .t-tit a span {display:inline-block;margin-right:5px;background:#b68946;text-align: center;color:#fff;width:auto;height:auto;padding:1px 10px 2px;border-radius: 50px;vertical-align:top;}
.list-table-wrap li .t-tit a:hover {text-decoration:none;}
.list-table-wrap li .t-writer {width: 10%;}
.list-table-wrap li .t-date {width: 10%;}
.list-table-wrap li .t-status {width: 10%;}
@ -1322,7 +1336,6 @@ transform: rotate(45deg);}
.list-table-wrap .t-status em {text-align: center;font-size: 14px;width: 82px;height: 30px;line-height: 30px;display: block;margin: 0 auto;border-radius: 15px;border: 1px solid #ddd;}
.list-table-wrap .t-status .complete {border:none;color:#fff;background-color:#154b92;}
.list-table-wrap .list-qna .t-type {width: 175px;}
.list-table-wrap li .t-type span {background:#b68946;display:inline-block;text-align: center;color:#fff;width:auto;height:auto;padding:1px 10px 2px;border-radius: 50px;}
.list-table-wrap li:hover .t-tit a {border-bottom:1px solid #376795;padding-bottom:1px;color:#376795;display: inline;}

39
src/main/webapp/css/media.css
View File

@ -39,7 +39,7 @@ a.pop-logo img { margin-right: 10px; }
/* 공지사항 */
.list-table-wrap li span.t-wrap { display: flex; align-items: center; }
.list-table-wrap li.t-tit-line .t-tit { justify-content: center; }
.list-table-wrap li .t-tit { width: 68%; display: flex; align-items: center; }
.list-table-wrap li .t-tit { width: 68%; align-items: center; }
.list-table-wrap li span.t-info { flex: 1; display: flex; align-items: center; }
.list-table-wrap li span.t-info > span { display: flex; align-items: center; justify-content: center; }
.list-table-wrap li .t-writer { width: 36%; }
@ -51,7 +51,7 @@ a.pop-logo img { margin-right: 10px; }
.cart .inner .loan-confirm .tabs_item .visit-select-box h3 { border-bottom: none; }
.cart .inner .loan-confirm .tabs_item .list-cart-wrap { margin-bottom: 20px; }
.cart .inner .loan-confirm .visit-text { color: #666666; font-size: 14px; font-weight: 400; text-align: left; margin-bottom: 40px; }
.cart .inner .loan-confirm .visit-select-box select { height: 36px; line-height: 36px; padding: 0px 2%; border: 1px solid #ddd; border-radius: 3px; margin: 0 6px; }
.cart .inner .loan-confirm .visit-select-box select { height: 36px; line-height: 36px; padding: 0px 2%; border: 1px solid #ddd; border-radius: 3px; margin: 0 6px;background:#fff; }
.data.detail .inner .row-top .center .right .con-2 .de-data ul li.detail-accordion > span { float: left; }
.data.detail .inner .row-top .center .right .con-2 .de-data ul li.detail-accordion .desc-wrap { display: flex; }
.data.detail .inner .row-top .center .right .con-2 .de-data ul li.detail-accordion .desc-wrap .desc { position: relative; flex: 1; height: 20px; word-break: unset; overflow: hidden; text-overflow: ellipsis; font-size: 14px; color: #fff; line-height: 24px; }
@ -107,6 +107,11 @@ a.pop-logo img { margin-right: 10px; }
.sec1 .inner .banner h3 { font-size: 22px; line-height: 33px; top: 142px; }
.sec1 .inner .banner p { font-size: 14px; line-height: 21px; top: 220px; }
.sec1 .inner .banner p > span { display: block; }
.sec1 .inner .banner p:nth-of-type(2) {top:290px;}
.MainSwiper .swiper-slide {height:400px;display: flex;flex-direction: column;justify-content: center;}
.MainSwiper .swiper-slide .img {width:100%;height:100%;}
.MainSwiper .swiper-slide .img img {object-fit:cover;width:100%;height:100%;}
.MainSwiper .pagination {bottom: 55px;left: calc(50% - -135px);}
.sec1 .inner .color-box { width: 100vw; padding: 0 16px; box-sizing: border-box; top: -45px; }
.sec1 .inner .color-box .list { height: 85px; display: flex; align-items: center; flex-direction: column-reverse; }
.sec1 .inner .color-box .list .title { font-size: 12px; line-height: 18px; margin: 8px 0px 9px; }
@ -206,6 +211,9 @@ a.pop-logo img { margin-right: 10px; }
.join .inner .row-bottom .join-box .form-group .con .form-control { width: 100%; box-sizing: border-box; }
.join .inner .row-bottom .join-box .form-group .con .cer::placeholder { font-size: 12px !important; }
.join .inner .row-bottom .join-box .form-group .con select {width:32%;margin-left:0;}
.join .inner .row-bottom .join-box .form-group .con select#birth_yy {width:90%;}
.join .inner .row-bottom .join-box .form-group .con select#birth_mm {width:37%}
.join .inner .row-bottom .join-box .form-group .con select#birth_dd {width:37%;}
.join .inner .row-bottom .join-box .Usersex .con { display: flex; }
.join .inner .row-bottom .join-box .Usersex .chk { margin-right: 0; width: 50%; }
.join .inner .row-bottom .join-box .Userbirth .con { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; height: 86px; }
@ -219,7 +227,8 @@ a.pop-logo img { margin-right: 10px; }
.join .inner .row-bottom .join-box .Useraddr .row input.addr1 { width: 72% !important; }
.join .inner .row-bottom .join-box .form-group .con span.text,
.join .inner .row-bottom .join-box .form-group.service p:nth-of-type(2) { width: 100%; text-indent: -6px; padding-left: 6px; }
.join .inner .row-bottom .join-box .form-group .con span:nth-of-type(1) { width: 100%; vertical-align: top; margin-left: 0; }
.join .inner .row-bottom .join-box .form-group .con span:nth-of-type(1) { width: 94%; vertical-align: top; margin-left: 6%; }
.join .inner .row-bottom .join-box .form-group .con .row .chk-suc {top:2px;}
.join .inner .row-bottom .join-box .form-group.service .right label { margin-left: 0; }
.join .inner .row-bottom .join-box .form-group.service p.bg { text-indent: -6px; padding-left: 18px; }
.join .inner .row-bottom .join-box .form-group .con span.fail {width:100%;margin-bottom:10px;}
@ -259,7 +268,7 @@ a.pop-logo img { margin-right: 10px; }
.noti-data .list-accordion .answer { padding: 20px 10px 20px 64px; font-size: 14px; line-height: 21px; }
.noti-data .list-accordion .answer::before { width: 2px; height: 36px; left: 50px; top: 24px; }
/* 카트 */
/* 카트 */
.cart .contents { width: 100%; padding: 0 16px 100px; box-sizing: border-box; }
.cart .inner .tabs { display: flex; }
.cart .inner .tabs li { width: 50%; }
@ -284,7 +293,7 @@ a.pop-logo img { margin-right: 10px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type { display: flex; position: absolute; top: 14px; left: 32px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type span { padding: 5px 12px 5px; margin-right: 6px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 5px 0 40px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img { width: 159px; height: 114px; padding: 0; display: flex; align-items: center; justify-content: center;margin-top:80px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img { width: 189px; height: 144px; padding: 0; display: flex; align-items: center; justify-content: center; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img a,
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img img { height: 100%; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-state { width: 100%; position: absolute; text-align: left; bottom: 184px; padding: 0; }
@ -292,7 +301,7 @@ a.pop-logo img { margin-right: 10px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-loan,
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-visit { width: auto !important; display: flex; flex-direction: column; font-size: 12px; line-height: 18px; text-align: left; position: absolute; bottom: 20px; left: 220px; padding: 0; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date::before { content: "반납예정일"; color: #333333; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date { bottom: 134px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date { bottom: 130px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-loan::before { content: "대출"; color: #333333; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-loan { bottom: 76px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-visit::before { content: "방문열람"; color: #333333; }
@ -338,7 +347,7 @@ a.pop-logo img { margin-right: 10px; }
.cart-confirm .inner .visit-confirm .list-cart-wrap .list-cart div.list > div.t-data > div.title { width: 100%; }
.cart-confirm .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-state { bottom: 208px; }
.cart-confirm .inner .visit-confirm .list-cart-wrap .list-cart div.list-content > div.t-state { bottom: 188px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date { bottom: 158px; }
.cart .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-date { bottom: 154px; }
.cart .inner .visit-confirm .list-cart-wrap .list-cart div.list-content > div.t-date { bottom: 138px; }
.cart-confirm .inner .tabs_item .list-cart-wrap.confirm .list-cart div.list > div.t-visit,
.cart-confirm .inner .tabs_item .list-cart-wrap.complete .list-cart div.list > div.t-visit { bottom: 0; left: 10px; width: 100%; }
@ -501,8 +510,8 @@ a.pop-logo img { margin-right: 10px; }
.data.detail .inner .row-bottom { padding: 0; }
.data.detail .inner .row-top .center .left .cla { position: relative; }
.data.detail .inner .row-top .center .left .cla .con-1 { width: 100%; display: block; }
.data.detail .inner .row-top .center .left .cla .con-2 { position: absolute; top: 70px; padding: 0; }
.data.detail .inner .row-top .center .left .tit { font-size: 22px; margin-bottom: 50px; }
.data.detail .inner .row-top .center .left .cla .con-2 { position: absolute; top: 103px; padding: 0; }
.data.detail .inner .row-top .center .left .tit { font-size: 22px; margin-bottom: 50px;height:66px;overflow:hidden; }
.data.detail .inner .row-top .center .right .con-1 { display: flex; height: auto; border: none; }
.data.detail .inner .row-top .center .right .con-1 button { margin-top: 14px; width: 36px; height: 36px; }
.data.detail .inner .row-top .center .right .con-1 button.view { flex: 1; }
@ -583,6 +592,9 @@ a.pop-logo img { margin-right: 10px; }
.list-table-wrap li .t-file,
.list-table-wrap li .t-answer { width: auto; }
.list-table-wrap li .t-writer { margin-right: 10px; padding-right: 10px; border-right: 1px solid #ccc; line-height: 1; }
.list-table-wrap li .t-tit {display:flex;}
/* 공지사항 상세 */
.view-tit { position: relative; padding-left: 60px; box-sizing: border-box; width: 100%; }
@ -788,10 +800,10 @@ a.pop-logo img { margin-right: 10px; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.type { position: absolute; top: -56px; left: 20px; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.img a img { width: auto; height: 100%; display: block; margin: auto; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.type,
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.title { width: 100%; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.title { width: auto; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.code { margin-bottom: 0; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.subject { position: absolute; left: 150px; bottom: 20px; width: auto; height: 90px; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.subject span { padding-right: 6px; margin-right: 6px; height: 15px; line-height: 15px; border-right: 1px solid #ccc; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.subject span { display:inline-block;padding-right: 8px; margin-right: 8px; height: 12px; line-height: 12px; border-right: 1px solid #ccc; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.subject span:last-child { border-right: none; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-data > div.subject em { display: none; }
.interested-data .inner .data-box .list-data-wrap .list-data div.list > div.t-btn { width: 100%; padding: 20px 0 !important; }
@ -808,7 +820,8 @@ a.pop-logo img { margin-right: 10px; }
.visit-data .mo_tabs_wrap,
.loan-data .mo_tabs_wrap { height: 55px; padding-left: 16px; box-sizing: border-box; }
.visit-data .inner .tabs,
.loan-data .inner .tabs { width: max-content; }
.loan-data .inner .tabs { /*width: max-content;*/display: flex;white-space: nowrap;overflow-y: hidden;overflow-x: auto;text-align: center;height: 50px;width:100%;}
.loan-data .inner .tabs li {width:30%;}
.visit-data .mo_tabs_wrap .tabs li a,
.loan-data .mo_tabs_wrap .tabs li a { border-radius: 0; }
.visit-data .mo_tabs_wrap .tabs li:first-child a,
@ -842,6 +855,8 @@ a.pop-logo img { margin-right: 10px; }
.visit-data .inner .tabs_item .list-wrap .list-data div.list > div.n-subscription .date::before { content: "신청일: "; }
.visit-data .inner .tabs_item .list-wrap .list-data div.list > div.n-visit .date::before { content: "희망방문일: "; }
.visit-data .inner .tabs_item .list-wrap .list-data div.list > div.n-return .date::before { content: "반납예정일: "; }
.visit-data .inner .tabs li {width:30%;}
/* 대출관리 */
.loan-data .inner .tabs_item .list-wrap .list-data div.list > div.n-cultural { margin-top: 10px; }

93
src/main/webapp/js/default.js
View File

@ -1,27 +1,3 @@
// 회원가입 셀렉트박스
function birthdaySelectBox() {
var now = new Date();
var year = now.getFullYear();
var mon = (now.getMonth() + 1) > 9 ? ''+(now.getMonth() + 1) : '0'+(now.getMonth() + 1);
var day = (now.getDate()) > 9 ? ''+(now.getDate()) : '0'+(now.getDate());
// 년도
for(var i = 1900 ; i <= year ; i++) {
$('#birth_yy').append('<option value="' + i + '">' + i + '년</option>');
}
// 월별
for(var i=1; i <= 12; i++) {
var mm = i > 9 ? i : "0"+i ;
$('#birth_mm').append('<option value="' + mm + '">' + mm + '월</option>');
}
// 일별
for(var i=1; i <= 31; i++) {
var dd = i > 9 ? i : "0"+i ;
$('#birth_dd').append('<option value="' + dd + '">' + dd+ '일</option>');
}
};
$(document).ready(function(){
/* 상단 메뉴 Fixed */
@ -71,18 +47,46 @@ $(document).ready(function(){
$(".pop-login-password .login-close").click(function(){
$(".pop-login-password").fadeOut();
});
// 회원가입 셀렉트박스
function birthdaySelectBox() {
var now = new Date();
var year = now.getFullYear();
var mon = (now.getMonth() + 1) > 9 ? ''+(now.getMonth() + 1) : '0'+(now.getMonth() + 1);
var day = (now.getDate()) > 9 ? ''+(now.getDate()) : '0'+(now.getDate());
// 년도
for(var i = 1900 ; i <= year ; i++) {
$('#birth_yy').append('<option value="' + i + '">' + i + '년</option>');
}
// 월별
for(var i=1; i <= 12; i++) {
var mm = i > 9 ? i : "0"+i ;
$('#birth_mm').append('<option value="' + mm + '">' + mm + '월</option>');
}
// 일별
for(var i=1; i <= 31; i++) {
var dd = i > 9 ? i : "0"+i ;
$('#birth_dd').append('<option value="' + dd + '">' + dd+ '일</option>');
}
};
// scroll top button
$(window).scroll(function() {
// 스크롤 탑 버튼
$(window).scroll(function () {
var $window = $(window);
var $document = $(document);
var $footer = $('#footer');
var $scrollBtn = $('#btn-go-top');
var $footer = $("#footer");
var $scrollBtn = $("#btn-go-top");
var $scrollCartBtn = $(".btn-cart-top");
$scrollBtn.on('click', function () {
$("html, body").stop().animate({
scrollTop: 0
}, 600);
$scrollBtn.on("click", function () {
$("html, body").stop().animate(
{
scrollTop: 0,
},
600
);
return false;
});
@ -93,28 +97,33 @@ $(document).ready(function(){
// top버튼 x좌표설정
function btnXPosition() {
var rightPosition = ($document.width() - 1756) / 2
var rightPosition = ($document.width() - 1756) / 2;
// X position
if($document.width() > 1756) {
if ($document.width() > 1756) {
//$scrollBtn.css('right', rightPosition);
$scrollBtn.css('right', '25px');
$scrollBtn.css("right", "25px");
} else {
$scrollBtn.css('right', '25px');
$scrollBtn.css("right", "25px");
}
}
$window.on('scroll', function () {
// $scrollCartBtn 관련 스크립트 추가
$window.on("scroll", function () {
if ($window.scrollTop() < $document.height() - $window.height() - $footer.outerHeight() + 37) {
$scrollBtn.addClass('go-top-fix');
$scrollBtn.addClass("go-top-fix");
$scrollCartBtn.addClass("go-cart-fix");
} else {
$scrollBtn.removeClass('go-top-fix');
$scrollBtn.removeClass("go-top-fix");
$scrollCartBtn.removeClass("go-cart-fix");
}
if ($window.scrollTop() < ($window.height() / 3)) {
$scrollBtn.addClass('go-top-hide');
if ($window.scrollTop() < $window.height() / 3) {
$scrollBtn.addClass("go-top-hide");
$scrollCartBtn.addClass("go-cart-hide");
} else {
$scrollBtn.removeClass('go-top-hide');
$scrollBtn.removeClass("go-top-hide");
$scrollCartBtn.removeClass("go-cart-hide");
}
});
});

36
src/main/webapp/js/nlib.js
View File

@ -406,8 +406,26 @@ function gfn_showDocPdf(interfaceId,masterId,typeDivCd,dtlsTypeDivCd) {
var openNewWindow = window.open(url + interfaceId, "_blank");
}
function snsShare(snsType, url) {
function gfn_setSnsShare(interfaceId,masterId,typeDivCd,dtlsTypeDivCd){
var url=window.location.protocol + "//" + window.location.host + window.location.pathname + "?masterId=" + masterId;
if(interfaceId != null && interfaceId != '')
{
if(typeDivCd == "IT_PHOTO" && (dtlsTypeDivCd == "C199" || dtlsTypeDivCd == "C01")){
url = IMAGE_VIEW_URL;
}else if((typeDivCd == "IT_VIDEO") && (dtlsTypeDivCd == "C290" || dtlsTypeDivCd == "C02" || dtlsTypeDivCd == "C03")){
url = VIDEO_VIEW_URL;
}else{
url = DOC_VIEW_URL;
}
}
$('#div_pop-sharing img').attr('data-cUrl',url); // url 모두 맵핑
if(url != null && url != ''){
getShortUrlData(url);
}
}
function gfn_snsShare(snsType, url) {
var url,name,specs,changedUrl,title;
if(document.title.indexOf("|") > -1){
title = encodeURIComponent($.trim(document.title.split("|")[1]));
@ -438,22 +456,10 @@ function snsShare(snsType, url) {
window.open(url, name, specs);
}
$( document ).on('click' , 'button.share', function (e) {
//e.preventDefault();
var tUrl = $(this).attr('data-cUrl');
$('#div_pop-sharing img').attr('data-cUrl',tUrl); // url 모두 맵핑
if(tUrl != null && tUrl != ''){
/*if(tUrl.indexOf(location.host) == -1){
tUrl = location.protocol + '//' + location.host + tUrl;
}*/
getShortUrlData(tUrl);
}
});
$( document )
.on('click', '#div_pop-sharing img.sns-pop', function(e) {
e.preventDefault();
snsShare($(this).attr('data-sType'),$(this).attr('data-cUrl'));
gfn_snsShare($(this).attr('data-sType'),$(this).attr('data-cUrl'));
})
.on('click', '#div_pop-sharing button.btn-close-pop', function(e) {
e.preventDefault();