DBNT
/
kcscDev
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DBNT:ec8ec0e04d3cd6aa35b659f8cd362308157a8d92
Branches Tags
DBNT:master
DBNT:thkim
DBNT:cks
..
compare: DBNT:317ee491ad39dcaddd00f86b82c09e45bd798376
Branches Tags
DBNT:master
DBNT:thkim
DBNT:cks

11 Commits
ec8ec0e04d ... 317ee491ad

Author SHA1 Message Date
thkim 317ee491ad feat: 관리자 단에서 '컨텐츠 관리' > '팝업 관리'에 '팝업 추가' 버튼 클래스 변경 건 2024-01-09 10:47:48 +09:00
Lim\jun 61412ab597 tit_2 제거 2024-01-09 10:19:19 +09:00
Lim\jun 0812a24e67 버튼 css 수정 2024-01-09 10:17:05 +09:00
Lim\jun 516691ea24 버튼 css 수정 2024-01-09 10:13:50 +09:00
Lim\jun 965af353b4 글자크기, 버튼크기 css 수정 2024-01-09 09:39:20 +09:00
Lim\jun 3bd88c669e 공간, 글자크기, 버튼크기 css 수정 2024-01-09 09:32:26 +09:00
Lim\jun b35220416e 공간 css 수정 2024-01-08 16:16:20 +09:00
thkim 545d1cda05 Merge branch 'master' of http://118.219.150.34:50501/DBNT/kcscDev 2024-01-08 15:58:22 +09:00
thkim 2ff16b4620 Merge branch 'thkim' 2024-01-08 15:58:14 +09:00
Lim\jun 1a52fb522a 공간 css 수정 2024-01-08 15:53:48 +09:00
thkim 9fa9958e7f feat: '위원회 일정 등록' 페이지에서 '구분'을 서버로 부터 목록 받도록 기능 추가 
관리자 단에서 '위원회 관리' > '위원회 일정 관리'에 '등록' 버튼을 누른 후 '위원회 일정 등록' 페이지에서 '구분'을 서버로 부터 목록 받도록 기능 추가
 2024-01-08 13:58:54 +09:00
7 changed files with 93 additions and 39 deletions
Show Stats Expand all files Collapse all files

45
egovframe-template-simple-react-contribution/src/css/component.css
View File

@ -15,8 +15,26 @@
.btn.noscript {font-size: 0;}
.btn > span {position: relative;}
.btn_blue_h46 {height: 46px; border-radius: 5px; color: #fff; font-size: 16px; line-height: 46px; text-align: center; background: #169bd5;}
.btn_skyblue_h46 {height: 46px; border-radius: 5px; color: #005b82; font-size: 16px; line-height: 46px; text-align: center; background: #daedf5;}
.btn_blue_h46 {height: 46px; border-radius: 5px; color: #fff; font-size: 15px; line-height: 46px; text-align: center; background: #169bd5; padding: 0px;}
.btn_blue_h46:hover {height: 46px; border-radius: 5px; color: #169bd5; font-size: 15px; line-height: 46px; text-align: center; border: 1px solid #169bd5; padding: 0px;}
.btn_skyblue_h46 {height: 46px; border-radius: 5px; color: #005b82; font-size: 15px; line-height: 46px; text-align: center; background: #daedf5; padding: 0px;}
.btn_skyblue_h46:hover {height: 46px; border-radius: 5px; color: #005b82; font-size: 15px; line-height: 46px; text-align: center; border: 1px solid #daedf5; padding: 0px;}
.btn_red_h46 {height: 46px; border-radius: 5px; color: darkred; font-size: 15px; line-height: 46px; text-align: center; background: #ed898b; padding: 0px;}
.btn_red_h46:hover {height: 46px; border-radius: 5px; color: darkred; font-size: 15px; line-height: 46px; text-align: center; border: 1px solid #ed898b; padding: 0px;}
.btn_blue_h32 {height: 32px; border-radius: 5px; color: #fff; font-size: 15px; line-height: 32px; text-align: center; background: #169bd5; padding: 0px;}
.btn_blue_h32:hover {height: 32px; border-radius: 5px; color: #169bd5; font-size: 15px; line-height: 32px; text-align: center; border: 1px solid #169bd5; padding: 0px;}
.btn_skyblue_h32 {height: 32px; border-radius: 5px; color: #005b82; font-size: 15px; line-height: 32px; text-align: center; background: #daedf5; padding: 0px;}
.btn_skyblue_h32:hover {height: 32px; border-radius: 5px; color: #005b82; font-size: 15px; line-height: 32px; text-align: center; border: 1px solid #daedf5; padding: 0px;}
.btn_red_h32 {height: 32px; border-radius: 5px; color: darkred; font-size: 15px; line-height: 32px; text-align: center; background: #ed898b; padding: 0px;}
.btn_red_h32:hover {height: 32px; border-radius: 5px; color: darkred; font-size: 15px; line-height: 32px; text-align: center; border: 1px solid #ed898b; padding: 0px;}
.btn_blue_h31 {height: 31px; border-radius: 5px; color: #fff; font-size: 15px; line-height: 31px; text-align: center; background: #169bd5; padding: 0px;}
.btn_blue_h31:hover {height: 31px; border-radius: 5px; color: #169bd5; font-size: 15px; line-height: 31px; text-align: center; border: 1px solid #169bd5; padding: 0px;}
.btn_skyblue_h31 {height: 31px; border-radius: 5px; color: #005b82; font-size: 15px; line-height: 31px; text-align: center; background: #daedf5; padding: 0px;}
.btn_skyblue_h31:hover {height: 31px; border-radius: 5px; color: #005b82; font-size: 15px; line-height: 31px; text-align: center; border: 1px solid #daedf5; padding: 0px;}
.btn_red_h31 {height: 31px; border-radius: 5px; color: darkred; font-size: 15px; line-height: 31px; text-align: center; background: #ed898b; padding: 0px;}
.btn_red_h31:hover {height: 31px; border-radius: 5px; color: darkred; font-size: 15px; line-height: 31px; text-align: center; border: 1px solid #ed898b; padding: 0px;}
.btn_upload {position: relative; width: 180px; height: 46px; border-radius: 5px; color: #fff; font-size: 16px; line-height: 46px; text-align: center; background: #169bd5;}
.btn_upload span {display: inline-block; height: 46px; line-height: 46px;}
@ -34,6 +52,7 @@
.board_list .head {display: table; table-layout: fixed; width: 100%;}
/* changed by lim padding: 25px 0 27px 0; */
.board_list .head > span {display: table-cell; padding: 10px 0 10px 0; border-bottom: 1px solid #888; font-size: 16px; font-weight: 500px; text-align: center;}
.logs_list .result {max-height: 430px;}
.board_list .result .list_item {display: table; width: 100%; table-layout: fixed;}
/* changed by lim padding: 18px 0 20px 0; */
.board_list .result .list_item > div {display: table-cell; padding: 7px 0 7px 0; border-bottom: 1px solid #dde2e5; color: #666; font-size: 16px; text-align: center; vertical-align: middle;}
@ -94,7 +113,7 @@
.board_view2 {border-top: 2px solid #222;}
.board_view2 dl {display: table; width: 100%; table-layout: fixed; border-bottom: 1px solid #dde2e5;}
.board_view2 dl > * {display: table-cell; table-layout: fixed; vertical-align: middle;}
.board_view2 dl dt {width: 176px; padding: 12px 25px; color: #000; font-size: 18px; letter-spacing: -2px; background: #f5f6f7; word-break: break-all;}
.board_view2 dl dt {width: 176px; padding: 12px 25px; color: #000; font-size: 15px; letter-spacing: -2px; background: #f5f6f7; word-break: break-all;} /* changed by lim font-size: 18px;*/
.board_view2 dl dt .req {display: inline-block; width: 7px; height: 7px; margin-left: 2px; font-size: 0; background: url(css/images/ico_req.png) no-repeat; vertical-align: 17px;}
.board_view2 dl dd {padding: 12px 15px; color: #222; font-size: 16px; font-weight: 300;}
.board_view2 .file_add {margin-top: 5px;}
@ -168,14 +187,16 @@
/* Condition */
.condition {padding: 26px; border: 1px solid #dde2e5; border-radius: 10px; font-size: 0; text-align: center;}
.condition {padding: 10px; border: 1px solid #dde2e5; border-radius: 10px; font-size: 0; text-align: center;} /* changed by lim padding: 26px;*/
.condition > ul,
.condition > ul li {display: inline-block; vertical-align: top;}
.condition > ul li + li {margin-left: 20px;}
.condition > ul .prev {display: inline-block; width: 46px; height: 46px; border: 1px solid #dde2e5; border-radius: 5px; background: #fff url(css/images/ico_prev.png) no-repeat center;}
.condition > ul .next {display: inline-block; width: 46px; height: 46px; border: 1px solid #dde2e5; border-radius: 5px; background: #fff url(css/images/ico_prev.png) no-repeat center; transform: rotate(180deg);}
.condition > ul li .prev + span {display: inline-block; height: 46px; margin: 0 10px; padding: 0 30px; border-radius: 5px; font-size: 16px; line-height: 46px; background: #f7f7f7; vertical-align: top;}
.condition .lb {display: inline-block; height: 46px; margin-right: 20px; color: #222; font-size: 16px; font-weight: 300; line-height: 46px; vertical-align: top;}
/* changed by lim prev and next width: 46px; height: 46px; */
.condition > ul .prev {display: inline-block; width: 32px; height: 32px; border: 1px solid #dde2e5; border-radius: 5px; background: #fff url(css/images/ico_prev.png) no-repeat center;}
.condition > ul .next {display: inline-block; width: 32px; height: 32px; border: 1px solid #dde2e5; border-radius: 5px; background: #fff url(css/images/ico_prev.png) no-repeat center; transform: rotate(180deg);}
/* changed by lim .span height: 46px; line-height: 46px; */
.condition > ul li .prev + span {display: inline-block; height: 32px; margin: 0 10px; padding: 0 30px; border-radius: 5px; font-size: 16px; line-height: 32px; background: #f7f7f7; vertical-align: top;}
.condition .lb {display: inline-block; height: 32px; margin-right: 20px; color: #222; font-size: 16px; font-weight: 300; line-height: 32px; vertical-align: top;} /* changed by lim height: 46px;*/
/* Icon */
@ -218,7 +239,7 @@ select::-ms-expand {display:none;}
.f_rdo.on {background: url(css/images/bg_form_rdo_on.png) no-repeat;}
.f_rdo input {position: absolute; top: -9999px;}
.f_select {display: inline-block; position: relative; height: 46px; border: 0; border-radius: 5px; background: #f7f7f7;}
.f_select {display: inline-block; position: relative; height: 32px; border: 0; border-radius: 5px; background: #f7f7f7;} /* changed by lim height: 46px;*/
.f_select::after {content: ""; display: block; position: absolute; right: 20px; top: 50%; transform: translateY(-50%); width: 15px; height: 9px; background: url(css/images/ico_arrow_gray_15x9.png) no-repeat;}
.f_select select {width: 100%; height: 100%; padding: 0 40px 0 20px; border: 0; color: #222; font-size: 16px; background: transparent;}
@ -238,17 +259,17 @@ select::-ms-expand {display:none;}
.f_inn_txt {display: inline-block; height: 46px; color: #222; font-size: 16px; line-height: 46px; vertical-align: top;}
.f_search {display: inline-block; position: relative;}
.f_search input[type=text] {width: 100%; height: 46px; padding: 0 55px 0 20px; border: 0; border-radius: 5px; color: #222; font-size: 16px; background: #f7f7f7;}
.f_search input[type=text] {width: 100%; height: 32px; padding: 0 55px 0 20px; border: 0; border-radius: 5px; color: #222; font-size: 16px; background: #f7f7f7;} /* changed by lilm height: 46px;*/
.f_search input[type=text] + button {display: block; position: absolute; right: 15px; top: 50%; transform: translateY(-50%); width: 25px; height: 27px; font-size: 0; background: url(css/images/ico_search_b.png) no-repeat; background-size: contain;}
.f_search2 {display: inline-block; position: relative;}
.f_search2 input[type=text] {width: 100%; height: 46px; padding: 0 55px 0 20px; border: 1px solid #dde2e5; border-radius: 5px; color: #222; font-size: 16px; background: #fff;}
.f_search2 input[type=text] {width: 100%; height: 32px; padding: 0 55px 0 20px; border: 1px solid #dde2e5; border-radius: 5px; color: #222; font-size: 16px; background: #fff;}/* changed by lilm height: 46px;*/
.f_search2 input[type=text] + button {display: block; position: absolute; right: 15px; top: 50%; transform: translateY(-50%); width: 25px; height: 27px; font-size: 0; background: url(css/images/ico_search_b.png) no-repeat; background-size: contain;}
/* Title */
/* changed by lim padding-bottom: 50px; font-size: 48px; added by lim margin-top: 10px;*/
.tit_1 {position: relative; padding-bottom: 10px; margin-top: 10px; color: #222; font-size: 38px; font-weight: 500; letter-spacing: -2px; line-height: 48px;}
.tit_1 {position: relative; padding-bottom: 10px; margin-top: 10px; margin-bottom: 10px; color: #222; font-size: 30px; font-weight: 500; letter-spacing: -2px; line-height: 48px;}
.tit_1::after {content: ""; display: block; position: absolute; left: 0; bottom: 0; width: 30px; height: 2px; background: #0465be;}
.tit_2 {font-size: 30px; font-weight: 700;}

11
egovframe-template-simple-react-contribution/src/css/layout.css
View File

@ -54,7 +54,7 @@ body {min-width: 1400px;}
.c_wrap .layout .nav .inner {border: 1px solid #dde2e5; border-radius: 10px;}
.nav_title{padding: 35px 30px 26px 30px;} /* changed by lim border-bottom: 4px solid #dde2e5; */
.c_wrap .layout .nav h2 {color: #222; font-size: 24px;}
.c_wrap .layout .nav ul {}/*padding: 26px 30px 27px 30px;*/
.c_wrap .layout .nav ul {padding: 0 10px} /* changed by lim padding: 26px 30px 27px 30px;*/
.c_wrap .layout .nav ul li + li {margin-top: 18px;} /* changed by lim margin-top: 27px; */
.c_wrap .layout .nav ul li a {display: block; position: relative; color: #666; font-size: 14px;} /* changed by lim font-size: 18px; */
.c_wrap .layout .nav ul li a:hover::after {content: ""; display: block; position: absolute; right: 0px; top: 50%; transform: translateY(-50%); width: 9px; height: 15px; background: url(css/images/ico_arrow_r_gray_9x15.png) no-repeat;}
@ -102,12 +102,13 @@ body {min-width: 1400px;}
/* Space */
.contents .tit_3:first-child {margin-top: -2px;}
.condition + .board_list {margin-top: 50px;}
.condition + .calendar_list {margin-top: 50px;}
.condition + .board_list {margin-top: 10px;} /* changed by lim margin-top: 50px; */
.condition + .calendar_list {margin-top: 10px;} /* changed by lim margin-top: 50px; */
.condition + .logs_list {margin-top: 10px;} /* added by lim margin-top: 10px; */
.condition + .tit_5 {margin-top: 42px;}
.top_tit + .tit_2 {margin-top: 13px;}
.top_tit + .tit_2 {margin-top: 13px; margin-bottom: 10px;} /* added by lim margin-bottom: 10px; */
.tit_2 + .condition {margin-top: 26px;}
/*.tit_2 + .condition {margin-top: 26px;}*/ /* removed by lim .tit_2 + .condition {margin-top: 26px;} */
.tit_2 + .board_view {margin-top: 43px;}
.tit_2 + .board_view2 {margin-top: 43px;}
.tit_2 + .board_view3 {margin-top: 43px;}

9
egovframe-template-simple-react-contribution/src/css/response.css
View File

@ -104,6 +104,15 @@
.btn_blue_h46 {height: 40px; font-size: 13px; line-height: 40px;}
.btn_skyblue_h46 {height: 40px; font-size: 13px; line-height: 40px;}
.btn_red_h46 {height: 40px; font-size: 13px; line-height: 40px;}
.btn_blue_h32 {height: 28px; font-size: 13px; line-height: 28px;}
.btn_skyblue_h32 {height: 28px; font-size: 13px; line-height: 28px;}
.btn_red_h32 {height: 28px; font-size: 13px; line-height: 28px;}
.btn_blue_h31 {height: 28px; font-size: 13px; line-height: 28px;}
.btn_skyblue_h31 {height: 28px; font-size: 13px; line-height: 28px;}
.btn_red_h31 {height: 28px; font-size: 13px; line-height: 28px;}
.btn_calendar {width: 40px; height: 40px; background-size: contain;}
.btn_upload {height: 40px; font-size: 13px; line-height: 40px;}
.btn_upload span {height: 40px; line-height: 40px;}

21
egovframe-template-simple-react-contribution/src/pages/admin/contents/PopUp.jsx
View File

@ -42,21 +42,20 @@ function PopUp(props) {
</div>
<div id="scope-popupMng" class="row admin-main-content-wrapper">
<div class="row">
<div class="btn-group pull-right">
<a href="/PopupMng/Create" class="btn btn-info btn-sm">
<span class="glyphicon glyphicon-pencil"></span>팝업 추가 </a>
<div>
<div>
<div className="right_col btn1">
<a href="/PopupMng/Create" className="btn btn_blue_h46 w_100">팝업 추가</a>
</div>
</div>
<div class="table-responsive content-box">
<table class="table table-condensed table-hover th-info">
<div className="table-responsive content-box">
<table className="table table-condensed table-hover th-info">
<thead>
<tr>
<th>제목</th>
<th>기간</th>
<th>사용여부</th>
<th>삭제</th>
<th>제목</th>
<th>기간</th>
<th>사용여부</th>
<th>삭제</th>
</tr>
</thead>
<tbody></tbody>

4
egovframe-template-simple-react-contribution/src/pages/admin/manager/EgovAdminPasswordUpdate.jsx
View File

@ -92,9 +92,9 @@ function EgovAdminPasswordUpdate(props) {
{/* <!-- 본문 --> */}
<div className="top_tit">
<h1 className="tit_1">사이트관리</h1>
<h1 className="tit_1">사이트관리자 암호변경</h1>
</div>
<h2 className="tit_2">사이트관리자 암호변경</h2>
<div className="board_view2">
<dl>
<dt><label htmlFor="oldPassword">기존 암호</label><span className="req">필수</span></dt>

39
kcsc-back-end/src/main/java/com/dbnt/kcscbackend/admin/committee/schedules/service/impl/EgovIndvdlSchdulManageServiceImpl.java
View File

@ -151,14 +151,31 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i
Map<String, Object> resultMap = new HashMap<String, Object>();
List<String> listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y").stream()
.map(lc -> lc.getItemNm())
List<Map<String, Object>> listCodes = tcCodeItemRepository.findByGrpCdAndUseYnOrderByGrpOrder("EVT_TYPE", "Y")
.stream()
.map(item -> {
Map<String, Object> codeMap = new HashMap<>();
codeMap.put("id", item.getItemCd());
codeMap.put("name", item.getItemNm());
return codeMap;
})
.collect(Collectors.toList());
List<String> listSubOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 3).stream()
.map(lc -> lc.getCmtNm())
List<Map<String, Object>> listSubOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 3).stream()
.map(item -> {
Map<String, Object> codeMap = new HashMap<>();
codeMap.put("id", item.getCmtSeq());
codeMap.put("name", item.getCmtNm());
return codeMap;
})
.collect(Collectors.toList());
List<String> listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream()
.map(lc -> lc.getCmtNm())
List<Map<String, Object>> listTopOrg = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", 2).stream()
.map(item -> {
Map<String, Object> codeMap = new HashMap<>();
codeMap.put("id", item.getCmtSeq());
codeMap.put("name", item.getCmtNm());
return codeMap;
})
.collect(Collectors.toList());
resultMap.put("listCodes", listCodes);
@ -174,8 +191,14 @@ public class EgovIndvdlSchdulManageServiceImpl extends EgovAbstractServiceImpl i
Map<String, Object> resultMap = new HashMap<String, Object>();
List<String> list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", paramCodeGroup).stream()
.map(lc -> lc.getCmtNm())
List<Map<String, Object>> list = tnCmtOrgRepository.findByUseYnAndUpCmtSeqOrderByCmtOrder("Y", paramCodeGroup)
.stream()
.map(item -> {
Map<String, Object> codeMap = new HashMap<>();
codeMap.put("id", item.getCmtSeq());
codeMap.put("name", item.getCmtNm());
return codeMap;
})
.collect(Collectors.toList());
resultMap.put("list", list);

3
kcsc-back-end/src/main/resources/application-local.properties
View File

@ -13,7 +13,8 @@ spring.datasource.hikari.maximum-pool-size=4
#spring.datasource.username=kcsc
#spring.datasource.password=dbnt0928!
spring.datasource.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
#spring.datasource.url=jdbc:log4jdbc:postgresql://127.0.0.1:5432/kcsc
spring.datasource.url=jdbc:log4jdbc:postgresql://118.219.150.34:50503/kcsc
spring.datasource.username=dbnt0031
spring.datasource.password=dbnt0928!