Merge branch 'daily' into dev

This commit is contained in:
김현주
2025-06-18 13:26:24 +09:00
33 changed files with 1347 additions and 476 deletions

View File

@@ -110,8 +110,8 @@
<h2>[[${#messages.msg(currentURI.id)}]]</h2>
</div>
</div>
<!--/* TODO 전체메뉴 선택 */-->
<button type="button" class="btn-allmenu"><span class="hide-txt">전체메뉴 열기</span></button>
<!--/* TODO 전체메뉴 선택 2차 */-->
<!--<button type="button" class="btn-allmenu"><span class="hide-txt">전체메뉴 열기</span></button>-->
</div>
</header>
</th:block>

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,49 @@
<!--/* [정책] 매달 30~31일 현황 등록 시에 마지막 완료 단계 직전에 노출 */-->
<div class="layer-wrap">
<div class="component-modal acco-wrap commentModal" data-props-dimm-click="true">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">임가 건의사항 등록</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<article class="alert-box full green">
<ul>
<li>임가경제조사 일계부를 작성하시면서 필요한 사항이나 불편하신 점 있으면 적어주세요. 보내주신 의견에 대해서는 가급적 빨리 답변을 드리겠습니다.</li>
</ul>
</article>
<form name="commentReqForm">
<section class="form-group">
<div class="segment-label">
<p class="label-txt">
임가 건의사항
</p>
</div>
<div class="component-input" data-props-count="1000" data-props-count-limit="1000">
<div class="input-textarea-field">
<textarea id="temp_textarea_0001" name="content" type="textarea" class="textarea" placeholder="임가 건의사항을 입력해 주세요."></textarea>
<span class="textarea-count" style="opacity: 1">(<em class="textarea-count-num">0</em>/<em class="textarea-count-total">1000</em>)</span>
</div>
</div>
</section>
</form>
<div class="component-btns">
<div class="btns-row">
<button type="button" class="btn btn-full btn-l btn-primary"
th:onclick="krip.daily.createComment([[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</div>
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</div>

View File

@@ -0,0 +1,37 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-none}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org" lang="ko">
<div layout:fragment="content" th:classappend="acco-wrap">
<th:block th:if="${@systemProperties['spring.profiles.active'] eq 'local'}">
<div>
reqVO: [[${reqVO}]]
</div>
<div>
detail: [[${dailyRecord}]]
</div>
</th:block>
<main id="content" role="main">
일계부 등록이
모두 완료 되었습니다.
</main>
</div>
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
let ENV = {
httpUrl: {
create: /*[[|/api/record/daily/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'createUrl',
},
month: [[${reqVO.searchMonth}]],
groupNo: [[${reqVO.groupNo}]],
submitted: false,
};
let formControl = {
};
</script>
</section>
</html>

View File

@@ -0,0 +1,102 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-none}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org" lang="ko">
<div layout:fragment="content" th:classappend="acco-wrap">
<main id="content" role="main">
<div class="inner">
<hgroup class="tit-group">
<i class="ico-alert-lightgreen ico-xlarge" aria-hidden="true"></i>
<h3>
일계부 등록이 <br>
종료 되었습니다.
</h3>
<p>
추가 입력 없이 등록 절차를 마쳤습니다. <br>
항목에 대한 '추가/수정/삭제'는 일계부에서 가능합니다.
</p>
</hgroup>
<section class="regist-item-area complete">
<div class="item-list">
<div class="list-item no-data"
th:each="item, itemStatus : ${dailyRecord.targetList}">
<div class="item-tit-group">
<p class="item-name">[[${item.desc}]]</p>
</div>
<ul class="detail-list">
<li>
<p>없음</p>
</li>
</ul>
</div>
<div class="list-item no-data">
<div class="item-tit-group">
<p class="item-name">임업노동 투입</p>
</div>
<ul class="detail-list">
<li>
<p>없음</p>
</li>
</ul>
</div>
<div class="list-item no-data">
<div class="item-tit-group">
<p class="item-name">지출</p>
</div>
<ul class="detail-list">
<li>
<p>없음</p>
</li>
</ul>
</div>
<div class="list-item no-data">
<div class="item-tit-group">
<p class="item-name">동력 사용시간</p>
</div>
<ul class="detail-list">
<li>
<p>없음</p>
</li>
</ul>
</div>
<div class="list-item no-data">
<div class="item-tit-group">
<p class="item-name">임업생산물 중 자가소비량</p>
</div>
<ul class="detail-list">
<li>
<p>없음</p>
</li>
</ul>
</div>
<div class="list-item no-data">
<div class="item-tit-group">
<p class="item-name">농업생산물 중 자가소비량</p>
</div>
<ul class="detail-list">
<li>
<p>없음</p>
</li>
</ul>
</div>
</div>
</section>
</div>
</main>
<div class="component-btns fixed">
<div class="btns-row">
<button type="button" class="btn btn-l btn-primary" onclick="krip.daily.goToMain();">
<span class="btn-txt">확인</span>
</button>
</div>
</div>
</div>
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
</section>
</html>

View File

@@ -100,23 +100,28 @@
<div class="component-btns fixed">
<div class="btns-row">
<button type="button" class="btn btn-l btn-primary" th:onclick="formControl.createValid([[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:onclick="formControl.createValid([[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>
</div>
</div>
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:src="@{/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
let ENV = {
httpUrl: {
create: /*[[|/api/record/daily/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'createUrl',
},
month: [[${reqVO.searchMonth}]],
groupNo: [[${reqVO.groupNo}]],
month: /*[[${reqVO.searchMonth}]]*/'month',
groupNo: /*[[${reqVO.groupNo}]]*/'groupNo',
submitted: false,
};
@@ -140,17 +145,17 @@
let message = ', 등록하실 항목이 없나요?';
let $messageWrap = $('#content .tit-group h3');
if ($messageWrap.data('start').indexOf($messageWrap.data('end')) !== -1) {
if ($messageWrap.data('start').indexOf($messageWrap.data('end')) === -1) {
message = $messageWrap.data('start') + '~' + $messageWrap.data('end') + message;
} else {
message = $messageWrap.data('start') + message;
}
etUI.dialog.alert({
title: "등록 항목 확인",
title: '등록 항목 확인',
message: message,
type: "confirm",
dialogType: "confirm",
type: 'confirm',
dialogType: 'confirm',
callback: function () {
formControl.create();
},
@@ -169,9 +174,13 @@
obj,
function () {
if (f.todayNone.value === 'Y') {
krip.daily.goToMain();
if ($('._nextStep').data('last')) {
krip.daily.goToNext('LAST', ENV.month, ENV.groupNo);
} else {
krip.daily.goToDone(ENV.month, ENV.groupNo);
}
} else {
krip.daily.goToNext($('input:checked').eq(0).data('target'), ENV.month, ENV.groupNo);
krip.daily.goToMain();
}
},
);

View File

@@ -92,13 +92,15 @@
</main>
<!-- 하단 고정 버튼 -->
<div class="component-btns fixed">
<div class="component-btns fixed"
th:if="${moveStep}">
<div class="btns-row">
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, 'TODAY_NONE') and #lists.isEmpty(expenseList)}">
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, 'TODAY_NONE') and #lists.isEmpty(expenseList)}"
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>
</div>
@@ -122,6 +124,9 @@
</div>
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>
<section layout:fragment="script">
@@ -165,10 +170,7 @@
console.log('selectItemCallback', selectValue, dataValue)
$('input[name="unitCode"]').val(dataValue)
// TODO : ui js 에서 show 적용유무 파악하기
if (dataValue === 'code.record.unit.self') {
$('#unitCode').parent().find('.component-input').addClass('show');
}
etUI.pages.initDirectInputToggle();
}
});
@@ -220,16 +222,7 @@
ENV.httpUrl.create.replace('{id}', f.id.value ? f.id.value : '0'),
obj,
function (rstData, status) {
console.log('rstData', rstData)
location.reload();
// TODO : next
/*
if (f.todayNone.value === 'Y') {
krip.daily.goToMain();
} else {
krip.daily.goToNext($('input:checked').eq(0).data('target'), ENV.month, ENV.groupNo);
}
*/
},
);
},

View File

@@ -96,13 +96,15 @@
</main>
<!-- 하단 고정 버튼 -->
<div class="component-btns fixed">
<div class="component-btns fixed"
th:if="${moveStep}">
<div class="btns-row">
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
<span class="btn-txt">이전 단계로 이동</span>
</button>
<button type="button" class="btn btn-l btn-primary"
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, 'TODAY_NONE') and #lists.isEmpty(incomeList)}">
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, 'TODAY_NONE') and #lists.isEmpty(incomeList)}"
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>
</div>
@@ -126,6 +128,9 @@
</div>
</div>
<!-- //모달 팝업 -->
<!-- /* 건의사항 모달 팝업 */ -->
<th:block th:replace="~{/record/comment-modal}"></th:block>
<!-- /* //건의사항 모달 팝업 */ -->
</div>
<section layout:fragment="script">
@@ -178,12 +183,7 @@
console.log('selectItemCallback', selectValue, dataValue)
$('input[name="unitCode"]').val(dataValue)
// TODO : ui js 에서 show 적용유무 파악하기
/*
if (dataValue === 'code.record.unit.self') {
$('#unitCode').parent().find('.component-input').addClass('show');
}
*/
etUI.pages.initDirectInputToggle();
}
});
@@ -240,16 +240,7 @@
ENV.httpUrl.create.replace('{id}', f.id.value ? f.id.value : '0'),
obj,
function (rstData, status) {
console.log('rstData', rstData)
location.reload();
// TODO : next
/*
if (f.todayNone.value === 'Y') {
krip.daily.goToMain();
} else {
krip.daily.goToNext($('input:checked').eq(0).data('target'), ENV.month, ENV.groupNo);
}
*/
},
);
},