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

Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

master
강석 최 2023-01-20 14:17:38 +09:00
parent fdc940c758 7a1f7ce2cc
commit eaaafa71c5
10 changed files with 174 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dbnt/faisp/config/BaseController.java
View File

@ -70,20 +70,20 @@ public class BaseController {
ModelAndView mav = new ModelAndView("login/dashboard"); ModelAndView mav = new ModelAndView("login/dashboard");
PublicBoard noticeParams = new PublicBoard(); PublicBoard noticeParams = new PublicBoard();
noticeParams.setPublicType("PLB001"); noticeParams.setPublicType("PLB001");
noticeParams.setRowCnt(8); noticeParams.setRowCnt(7);
noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList()); noticeParams.setDownOrganCdList(loginUser.getDownOrganCdList());
noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList()); noticeParams.setUpOrganCdList(loginUser.getUpOrganCdList());
mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams)); mav.addObject("noticeList", publicBoardService.selectContentList(noticeParams));
FaRptBoard faRpt = new FaRptBoard(); FaRptBoard faRpt = new FaRptBoard();
faRpt.setActiveTab("receive"); faRpt.setActiveTab("receive");
faRpt.setRowCnt(8); faRpt.setRowCnt(7);
faRpt.setStatus("DST007"); faRpt.setStatus("DST007");
faRpt.setReceiveUserSeq(loginUser.getUserSeq()); faRpt.setReceiveUserSeq(loginUser.getUserSeq());
mav.addObject("faRptList", faRptService.selectFaRptList(faRpt)); mav.addObject("faRptList", faRptService.selectFaRptList(faRpt));
AffairBoard affair = new AffairBoard(); AffairBoard affair = new AffairBoard();
affair.setAffairCategory("CAT215"); affair.setAffairCategory("CAT215");
affair.setRatingOrgan(loginUser.getOgCd()); affair.setRatingOrgan(loginUser.getOgCd());
affair.setRowCnt(8); affair.setRowCnt(7);
mav.addObject("affair1List", affairService.selectAffairBoardList(affair)); mav.addObject("affair1List", affairService.selectAffairBoardList(affair));
affair.setAffairCategory("CAT216"); affair.setAffairCategory("CAT216");
mav.addObject("affair2List", affairService.selectAffairBoardList(affair)); mav.addObject("affair2List", affairService.selectAffairBoardList(affair));

30
src/main/resources/static/css/common.css
View File

@ -133,9 +133,8 @@
} }
.bg-header{ .bg-header{
/*background-color: #6c87af78;*/ /*background-color: #1650a778;*/
/*background-color: #6885bfb0;*/ background-color: #f8f8f8;
background-color: #1650a778;
} }
.bg-lightB-card{ .bg-lightB-card{
background-color: #deebff78; background-color: #deebff78;
@ -149,6 +148,10 @@
} }
.bg-leftMenu{ .bg-leftMenu{
background-color: #253660; background-color: #253660;
z-index: 100;
}
#footer{
z-index: 1;
} }
.bg-label{ .bg-label{
background-color: lightblue; background-color: lightblue;
@ -156,11 +159,28 @@
.table-color{ .table-color{
background-color: #6c87af78; background-color: #6c87af78;
} }
#footer ul {
width: 1200px;
margin-left: 550px;
display: block;
}
#footerRow{float:left;padding:0px 20px;color:#7a7a7a;line-height:1.6;font-size:12px;text-align:left; list-style: none;}
#footerSiteName{font-size:18px;color:#2f71d4;;display:block;font-weight:700;margin:0px;padding:0px;}
#footerSiteNameEng{font-size:10px;color:#989898;display:block;font-weight:300;margin:0px 0px 8px 0px;padding:0px;}
.bi-square-fill{ .bi-square-fill{
color:#0d49a7; /*color:#0d49a7;*/
/*color: #24396c;*/ font-size: 12px;
color: #24396c;
text-align: center;
} }
.col-form-label-sm.text-center{ .col-form-label-sm.text-center{
background-color: #aabfe178; background-color: #aabfe178;
} }
@font-face {font-family:'GmarketSansMedium';src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');}
.dash-title
{
font-family: 'GmarketSansMedium';
font-size: 18px;
}

BIN
src/main/resources/static/img/ft_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

31
src/main/resources/templates/fragments/footer.html
View File

@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"> <html lang="ko" xmlns:th="http://www.thymeleaf.org">
<footer th:fragment="footerFragment" class="d-flex flex-wrap py-2 mt-auto bg-dark"> <footer th:fragment="footerFragment" class="d-flex flex-wrap py-2 mt-auto">
<div class="row mx-3"> <div class="row mx-3">
<div class="col-auto"> <div class="col-auto">
<img th:src="@{/img/f_logo.png}" alt="logo" title="logo" style="height: 40px;"/> <img th:src="@{/img/ft_logo.png}" alt="logo" title="logo" style="height: 40px;"/>
</div> </div>
<div class="col-auto row"> <div class="col-auto row">
<div class="col-12"> <div class="col-12">
@ -15,4 +15,31 @@
</div> </div>
</div> </div>
</footer> </footer>
<!--<div id="footer" th:fragment="footerFragment" class="d-flex flex-wrap border-top">
<ul>
<li><img th:src="@{/img/ft_logo.png}" alt="사이버외사정보시스템로고"></li>
<li><p>사이버외사정보시스템</p>
<span>FOREIGN AFFAIRS INTELLIGENCE CYBER SYSTEM</span>
21995 인천광역시 연수구 해돋이로 130 해양경찰청<br/>
Copyright ⓒ 2011 MINISTRY OF REPUBLIC ADMINISTRATION AND SECURITY. All right reserved.</li>
&lt;!&ndash;<li style="margin-left: auto;"><img src="image/wa_logo.png" alt="웹접근성"></li>&ndash;&gt;
</ul>
</div>-->
<!--<div class="row w-100 mt-3 justify-content-center" id="footerRow" th:fragment="footerFragment">-->
<!-- <div class="col-auto">-->
<!-- <img src="/img/ft_logo.png" alt="사이버외사정보시스템로고" class="h-75">-->
<!-- </div>-->
<!-- <div class="col-auto">-->
<!-- <p id="footerSiteName">사이버외사정보시스템</p>-->
<!-- <span id="footerSiteNameEng">FOREIGN AFFAIRS INTELLIGENCE CYBER SYSTEM</span>-->
<!-- </div>-->
<!-- <div class="col-auto">-->
<!-- <p class="mb-1">21995 인천광역시 연수구 해돋이로 130 해양경찰청</p>-->
<!-- <p class="mb-1">Copyright ⓒ 2011 MINISTRY OF REPUBLIC ADMINISTRATION AND SECURITY. All right reserved.</p>-->
<!-- </div>-->
<!--</div>-->
</html> </html>

2
src/main/resources/templates/fragments/header.html
View File

@ -7,7 +7,7 @@
<div class="col-auto"> <div class="col-auto">
<div class="navbar-header"> <div class="navbar-header">
<a href="/" class="navbar-brand"> <a href="/" class="navbar-brand">
<img id="logo" th:src="@{/img/logo2.png}" alt="logo" title="logo"> <img id="logo" th:src="@{/img/logo2.png}" alt="logo" title="logo" sec:authorize="isAnonymous()">
</a> </a>
</div> </div>
</div> </div>

5
src/main/resources/templates/fragments/leftMenu.html
View File

@ -1,9 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"> <html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="pt-3" th:fragment="leftMenuFragment"> <div class="pt-3" th:fragment="leftMenuFragment">
<div>
</div>
<div class="flex-shrink-0 py-3 bg-transparent" id="leftMenu"> <div class="flex-shrink-0 py-3 bg-transparent" id="leftMenu">
<ul class="list-unstyled ps-0"> <ul class="list-unstyled ps-0">
<li class="mb-1" th:each="firstMenu:${session.menuList}"> <li class="mb-1 border-bottom border-secondary" th:each="firstMenu:${session.menuList}">
<th:block th:each="cat1Code:${session.commonCode.get('CAT1')}"> <th:block th:each="cat1Code:${session.commonCode.get('CAT1')}">
<th:block th:if="${cat1Code.itemCd eq firstMenu.cat1Cd}"> <th:block th:if="${cat1Code.itemCd eq firstMenu.cat1Cd}">
<button class="btn btn-toggle align-items-center rounded collapsed leftMenuItem text-light" style="font-size: 16px;" <button class="btn btn-toggle align-items-center rounded collapsed leftMenuItem text-light" style="font-size: 16px;"

120
src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
View File

@ -16,27 +16,27 @@
</ul> </ul>
<div class="tab-content bg-white border border-top-0 p-2"> <div class="tab-content bg-white border border-top-0 p-2">
<div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0"> <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1"> <div class="row border border-secondary">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">문서번호</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">문서번호</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="|해양경찰청외사-${affair.affairKey}|"></label> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="|해양경찰청외사-${affair.affairKey}|"></label>
</div> </div>
<div class="row mb-1"> <div class="row border border-top-0 border-secondary">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성자</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start"> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start">
<th:block th:each="code:${session.commonCode.get('JT')}"> <th:block th:each="code:${session.commonCode.get('JT')}">
<th:block th:if="${code.itemCd eq affair.wrtUserGrd}" th:text="${code.itemValue}"></th:block> <th:block th:if="${code.itemCd eq affair.wrtUserGrd}" th:text="${code.itemValue}"></th:block>
</th:block> </th:block>
<th:block th:text="${affair.wrtUserNm}"></th:block> <th:block th:text="${affair.wrtUserNm}"></th:block>
</label> </label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">보고일자</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">보고일자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}"></label> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">공개여부</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">공개여부</label>
<th:block th:each="code:${session.commonCode.get('AVS')}"> <th:block th:each="code:${session.commonCode.get('AVS')}">
<th:block th:if="${code.itemCd eq affair.viewStatus}"> <th:block th:if="${code.itemCd eq affair.viewStatus}">
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
</th:block> </th:block>
</th:block> </th:block>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">상태</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">상태</label>
<th:block th:each="code:${session.commonCode.get('DST')}"> <th:block th:each="code:${session.commonCode.get('DST')}">
<th:block th:if="${code.itemCd eq affair.affairStatus}"> <th:block th:if="${code.itemCd eq affair.affairStatus}">
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
@ -44,49 +44,51 @@
</th:block> </th:block>
</div> </div>
<hr> <hr>
<div class="row"> <div class="row border border-secondary">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">제목</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">제목</label>
<label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${affair.title}"></label> <label class="col-sm-11 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${affair.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">분야1</label> </div>
<div class="row border border-top-0 border-secondary">
<label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">분야1</label>
<th:block th:each="code:${session.commonCode.get('DC01')}"> <th:block th:each="code:${session.commonCode.get('DC01')}">
<th:block th:if="${code.itemCd eq affair.affairType1}"> <th:block th:if="${code.itemCd eq affair.affairType1}">
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
</th:block> </th:block>
</th:block> </th:block>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">분야2</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">분야2</label>
<th:block th:each="code:${session.commonCode.get('DC02')}"> <th:block th:each="code:${session.commonCode.get('DC02')}">
<th:block th:if="${code.itemCd eq affair.affairType2}"> <th:block th:if="${code.itemCd eq affair.affairType2}">
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
</th:block> </th:block>
</th:block> </th:block>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">분야3</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">분야3</label>
<th:block th:each="code:${session.commonCode.get('DC03')}"> <th:block th:each="code:${session.commonCode.get('DC03')}">
<th:block th:if="${code.itemCd eq affair.affairType3}"> <th:block th:if="${code.itemCd eq affair.affairType3}">
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
</th:block> </th:block>
</th:block> </th:block>
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">분야4</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">분야4</label>
<th:block th:each="code:${session.commonCode.get('DC04')}"> <th:block th:each="code:${session.commonCode.get('DC04')}">
<th:block th:if="${code.itemCd eq affair.affairType4}"> <th:block th:if="${code.itemCd eq affair.affairType4}">
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label> <label class="col-sm-2 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
</th:block> </th:block>
</th:block> </th:block>
</div> </div>
<hr> <hr>
<div class="row"> <div class="row border border-top-0 border-secondary">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">내용</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">내용</label>
<div class="col-sm-11 form-control-sm" id="contentDiv"> <div class="col-sm-11 form-control-sm" id="contentDiv">
<div th:utext="${affair.content}"></div> <div th:utext="${affair.content}"></div>
</div> </div>
</div> </div>
<hr> <hr>
<div class="row mb-1"> <div class="row border border-top-0 border-secondary">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">해시태그</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">해시태그</label>
<label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${affair.hashTags}"></label> <label class="col-sm-11 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${affair.hashTags}"></label>
</div> </div>
<div class="row mb-1"> <div class="row border border-top-0 border-secondary">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">비고</label> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">비고</label>
<label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${affair.etc}"></label> <label class="col-sm-11 border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${affair.etc}"></label>
</div> </div>
</div> </div>
<div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0"> <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
@ -115,61 +117,61 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="row"> <div class="row border border-top-0 border-secondary">
<div class="col-12" th:unless="${#lists.isEmpty(affair.rateList)}"> <div class="col-12" th:unless="${#lists.isEmpty(affair.rateList)}">
<hr> <hr>
<th:block th:each="rate:${affair.rateList}"> <th:block th:each="rate:${affair.rateList}">
<div class="row py-1"> <div class="row border border-top-0 border-secondary py-1">
<label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold"> <label class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">
<th:block th:each="code:${session.commonCode.get('OG')}"> <th:block th:each="code:${session.commonCode.get('OG')}">
<th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block> <th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block>
</th:block> </th:block>
</label> </label>
<div class="col-auto"> <div class="col-auto">
<div class="row" th:if="${rate.sectionApprv eq null}"> <div class="row border border-top-0 border-secondary" th:if="${rate.sectionApprv eq null}">
<label class="col-sm-auto col-form-label col-form-label-sm text-center">결재정보가 없습니다.</label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center">결재정보가 없습니다.</label>
</div> </div>
<div class="row" th:if="${rate.sectionApprv ne null}"> <div class="row border border-top-0 border-secondary" th:if="${rate.sectionApprv ne null}">
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">결재결과: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재결과: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start"> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start">
<th:block th:each="code:${session.commonCode.get('DST')}"> <th:block th:each="code:${session.commonCode.get('DST')}">
<th:block th:if="${code.itemCd eq rate.sectionApprv}" th:text="${code.itemValue}"></th:block> <th:block th:if="${code.itemCd eq rate.sectionApprv}" th:text="${code.itemValue}"></th:block>
</th:block> </th:block>
</label> </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">결재자: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재자: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.sectionNm}"></label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${rate.sectionNm}"></label>
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">결재일시: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재일시: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
</div> </div>
<div class="row" th:if="${rate.sectionApprv ne null and !#strings.isEmpty(rate.sectionEtc)}"> <div class="row border border-top-0 border-secondary" th:if="${rate.sectionApprv ne null and !#strings.isEmpty(rate.sectionEtc)}">
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">기타의견: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">기타의견: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.sectionEtc}"></label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${rate.sectionEtc}"></label>
</div> </div>
<div class="row" th:if="${rate.headApprv ne null}"> <div class="row border border-top-0 border-secondary" th:if="${rate.headApprv ne null}">
<th:block th:if="${rate.headApprv eq 'DST006'}"> <th:block th:if="${rate.headApprv eq 'DST006'}">
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">견문평가: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">견문평가: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start"> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start">
<th:block th:each="code:${session.commonCode.get('AAR')}"> <th:block th:each="code:${session.commonCode.get('AAR')}">
<th:block th:if="${code.itemCd eq rate.affairRate}" th:text="|${code.itemValue}${rate.organUp eq 'T'?'(상보)':''}|"></th:block> <th:block th:if="${code.itemCd eq rate.affairRate}" th:text="|${code.itemValue}${rate.organUp eq 'T'?'(상보)':''}|"></th:block>
</th:block> </th:block>
</label> </label>
</th:block> </th:block>
<th:block th:if="${rate.headApprv eq 'DST005'}"> <th:block th:if="${rate.headApprv eq 'DST005'}">
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">결재결과: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재결과: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start"> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start">
<th:block th:each="code:${session.commonCode.get('DST')}"> <th:block th:each="code:${session.commonCode.get('DST')}">
<th:block th:if="${code.itemCd eq rate.headApprv}" th:text="${code.itemValue}"></th:block> <th:block th:if="${code.itemCd eq rate.headApprv}" th:text="${code.itemValue}"></th:block>
</th:block> </th:block>
</label> </label>
</th:block> </th:block>
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">결재자: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재자: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.headNm}"></label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${rate.headNm}"></label>
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">결재일시: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재일시: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
</div> </div>
<div class="row" th:if="${rate.headApprv ne null and !#strings.isEmpty(rate.headEtc)}"> <div class="row border border-top-0 border-secondary" th:if="${rate.headApprv ne null and !#strings.isEmpty(rate.headEtc)}">
<label class="col-sm-auto col-form-label col-form-label-sm text-center fw-bold">기타의견: </label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">기타의견: </label>
<label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.headEtc}"></label> <label class="col-sm-auto border-end border-secondary col-form-label col-form-label-sm text-start" th:text="${rate.headEtc}"></label>
</div> </div>
</div> </div>
</div> </div>
@ -180,7 +182,7 @@
<input type="hidden" name="affairKey" th:value="${affair.affairKey}"> <input type="hidden" name="affairKey" th:value="${affair.affairKey}">
<th:block th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and affair.affairStatus eq 'DST002' and affair.rateList.get(0).ratingOrgan eq userOrgan}"> <th:block th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and affair.affairStatus eq 'DST002' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
<input type="hidden" name="sectionApprv" id="sectionApprv"> <input type="hidden" name="sectionApprv" id="sectionApprv">
<div class="row"> <div class="row border border-top-0 border-secondary">
<div class="col-10"> <div class="col-10">
<input type="text" class="form-control form-control-sm etc" name="sectionEtc" placeholder="추가의견, 반려사유 기입"> <input type="text" class="form-control form-control-sm etc" name="sectionEtc" placeholder="추가의견, 반려사유 기입">
<input type="text" class="d-none" id="submitPrevention"> <input type="text" class="d-none" id="submitPrevention">
@ -195,7 +197,7 @@
</th:block> </th:block>
<th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and affair.affairStatus eq 'DST004' and affair.rateList.get(0).ratingOrgan eq userOrgan}"> <th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and affair.affairStatus eq 'DST004' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
<input type="hidden" name="headApprv" id="headApprv"> <input type="hidden" name="headApprv" id="headApprv">
<div class="row"> <div class="row border border-top-0 border-secondary">
<div class="col-8"> <div class="col-8">
<input type="text" class="form-control form-control-sm etc" name="headEtc" placeholder="추가의견, 반려사유 기입"> <input type="text" class="form-control form-control-sm etc" name="headEtc" placeholder="추가의견, 반려사유 기입">
<input type="text" class="d-none" id="submitPrevention"> <input type="text" class="d-none" id="submitPrevention">

40
src/main/resources/templates/layout/layout.html
View File

@ -47,17 +47,48 @@
<th:block layout:fragment="script"></th:block> <th:block layout:fragment="script"></th:block>
</head> </head>
<body class="d-flex flex-column h-100"> <body class="d-flex flex-column h-100">
<header th:replace="fragments/header :: headerFragment"></header> <!--<header th:replace="fragments/header :: headerFragment"></header>
<div sec:authorize="isAnonymous()" layout:fragment="content"></div> <div sec:authorize="isAnonymous()" layout:fragment="content">
</div>
<div sec:authorize="isAuthenticated()" class="d-flex flex-nowrap h-100" style="max-height: 888px;"> <div sec:authorize="isAuthenticated()" class="d-flex flex-nowrap h-100" style="max-height: 888px;">
<div class="flex-shrink-0 bg-leftMenu border-end overflow-auto" style="width: 260px;"> <div class="flex-shrink-0 bg-leftMenu border-end overflow-auto" style="width: 260px;">
<div th:replace="fragments/leftMenu :: leftMenuFragment"></div> <div th:replace="fragments/leftMenu :: leftMenuFragment"></div>
</div> </div>
<div class="flex-shrink-0 px-3 py-2 bg-white overflow-auto" style="width: 1660px;"> <div class="flex-shrink-0 px-3 py-2 overflow-auto" style="width: 1660px; background-color: #f8f8f8;">
<div layout:fragment="content"></div> <div layout:fragment="content"></div>
</div> </div>
</div> </div>
<div th:replace="fragments/footer :: footerFragment"></div>
<div id="fadeDiv" style="display: none;">
<div class="p-5 rounded text-center">
<div>
<div class="spinner-border text-info" id="loading-spinner" role="status">
<span class="visually-hidden">Loading...</span>
</div>
</div>
<div id="loading-spinner-text">
<h3>Loading</h3>
</div>
</div>
</div>-->
<div class="d-flex flex-nowrap h-100" sec:authorize="isAnonymous()">
<div class="flex-shrink-0 overflow-auto w-100" style="background-color: #f8f8f8;">
<header th:replace="fragments/header :: headerFragment"></header>
<div layout:fragment="content"></div>
<div th:replace="fragments/footer :: footerFragment"></div>
</div>
</div>
<div class="d-flex flex-nowrap h-100" sec:authorize="isAuthenticated()">
<div class="flex-shrink-0 bg-leftMenu border-end overflow-auto" style="width: 260px;">
<div th:replace="fragments/leftMenu :: leftMenuFragment"></div>
</div>
<div class="flex-shrink-0 overflow-auto" style="width: 1660px;">
<header th:replace="fragments/header :: headerFragment"></header>
<div class="bg-light px-3 py-2" layout:fragment="content"></div>
<div th:replace="fragments/footer :: footerFragment"></div>
</div>
</div>
<div id="fadeDiv" style="display: none;"> <div id="fadeDiv" style="display: none;">
<div class="p-5 rounded text-center"> <div class="p-5 rounded text-center">
<div> <div>
@ -70,7 +101,6 @@
</div> </div>
</div> </div>
</div> </div>
<div th:replace="fragments/footer :: footerFragment"></div>
<th:block layout:fragment="modal"></th:block> <th:block layout:fragment="modal"></th:block>
</body> </body>
</html> </html>

22
src/main/resources/templates/login/dashboard.html
View File

@ -23,7 +23,7 @@
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header bg-white">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto">공지사항</div> <div class="col-auto dash-title">공지사항</div>
<div class="col-auto"><a href="/publicBoard/noticePage" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a href="/publicBoard/noticePage" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
@ -39,7 +39,7 @@
<tbody> <tbody>
<tr class="noticeTr" th:each="notice:${noticeList}"> <tr class="noticeTr" th:each="notice:${noticeList}">
<input type="hidden" class="publicKey" th:value="${notice.publicKey}"> <input type="hidden" class="publicKey" th:value="${notice.publicKey}">
<td> <td><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:if="${#strings.length(notice.title)>35}" th:text="|${#strings.substring(notice.title, 0, 35)}...|"></th:block> <th:block th:if="${#strings.length(notice.title)>35}" th:text="|${#strings.substring(notice.title, 0, 35)}...|"></th:block>
<th:block th:unless="${#strings.length(notice.title)>35}" th:text="${notice.title}"></th:block> <th:block th:unless="${#strings.length(notice.title)>35}" th:text="${notice.title}"></th:block>
</td> </td>
@ -57,7 +57,7 @@
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header bg-white">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto">외사정보보고 수신문서</div> <div class="col-auto dash-title">외사정보보고 수신문서</div>
<div class="col-auto"><a href="/faRpt/faRptBoard?activeTab=receive" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a href="/faRpt/faRptBoard?activeTab=receive" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
@ -72,7 +72,9 @@
<tbody> <tbody>
<tr class="faRptTr" th:each="faRpt:${faRptList}"> <tr class="faRptTr" th:each="faRpt:${faRptList}">
<input type="hidden" class="faRptKey" th:value="${faRpt.faRptKey}"> <input type="hidden" class="faRptKey" th:value="${faRpt.faRptKey}">
<td th:text="${faRpt.title}"></td> <td><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:text="${faRpt.title}"></th:block>
</td>
<td th:text="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}"></td> <td th:text="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
</tr> </tr>
</tbody> </tbody>
@ -85,7 +87,7 @@
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header bg-white">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto">외사경찰 견문관리</div> <div class="col-auto dash-title">외사경찰 견문관리</div>
<div class="col-auto"><a href="/affair/affairMgt?affairCategory=CAT215" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a href="/affair/affairMgt?affairCategory=CAT215" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
@ -101,7 +103,9 @@
<tbody> <tbody>
<tr class="affairTr" th:each="affair:${affair1List}"> <tr class="affairTr" th:each="affair:${affair1List}">
<input type="hidden" class="affairKey" th:value="${affair.affairKey}"> <input type="hidden" class="affairKey" th:value="${affair.affairKey}">
<td th:text="${affair.title}"></td> <td ><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:text="${affair.title}"></th:block>
</td>
<td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td> <td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
<th:block th:each="commonCode:${session.commonCode.get('DST')}"> <th:block th:each="commonCode:${session.commonCode.get('DST')}">
<td th:if="${affair.affairStatus eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td> <td th:if="${affair.affairStatus eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
@ -116,7 +120,7 @@
<div class="card"> <div class="card">
<div class="card-header bg-white"> <div class="card-header bg-white">
<div class="row justify-content-between"> <div class="row justify-content-between">
<div class="col-auto">외사첩보망 견문관리</div> <div class="col-auto dash-title">외사첩보망 견문관리</div>
<div class="col-auto"><a href="/affair/affairMgt?affairCategory=CAT216" class="link-dark"><i class="bi bi-list"></i></a></div> <div class="col-auto"><a href="/affair/affairMgt?affairCategory=CAT216" class="link-dark"><i class="bi bi-list"></i></a></div>
</div> </div>
</div> </div>
@ -132,7 +136,9 @@
<tbody> <tbody>
<tr class="affairTr" th:each="affair:${affair2List}"> <tr class="affairTr" th:each="affair:${affair2List}">
<input type="hidden" class="affairKey" th:value="${affair.affairKey}"> <input type="hidden" class="affairKey" th:value="${affair.affairKey}">
<td th:text="${affair.title}"></td> <td><i class="bi bi-dot" style="color: #3d73d7"></i>
<th:block th:text="${affair.title}"></th:block>
</td>
<td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td> <td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
<th:block th:each="commonCode:${session.commonCode.get('DST')}"> <th:block th:each="commonCode:${session.commonCode.get('DST')}">
<td th:if="${affair.affairStatus eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td> <td th:if="${affair.affairStatus eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>

4
src/main/resources/templates/publicBoard/notice/noticePage.html
View File

@ -9,7 +9,7 @@
</th:block> </th:block>
<div layout:fragment="content"> <div layout:fragment="content">
<main> <main>
<h4><i class="bi bi-square-fill"></i> 공지사항</h4> <h5><i class="bi bi-square-fill"></i> 공지사항</h5>
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/> <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/> <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="row mx-0"> <div class="row mx-0">
@ -80,7 +80,7 @@
<tr class="noticeTr" th:each="notice:${noticeList}"> <tr class="noticeTr" th:each="notice:${noticeList}">
<input type="hidden" class="publicKey" th:value="${notice.publicKey}"> <input type="hidden" class="publicKey" th:value="${notice.publicKey}">
<td><input type="checkbox" class="trChkBox"></td> <td><input type="checkbox" class="trChkBox"></td>
<td th:text="${notice.title}"></td> <td align="left" th:text="${notice.title}"></td>
<th:block th:each="commonCode:${session.commonCode.get('OG')}"> <th:block th:each="commonCode:${session.commonCode.get('OG')}">
<td th:if="${notice.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td> <td th:if="${notice.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block> </th:block>