Merge branch 'dev' into 'deploy-dev-front'
Dev See merge request korea-research/korea-research!58
This commit is contained in:
@@ -26,16 +26,7 @@
|
||||
<meta name="_csrf" th:content="${_csrf.token}"/>
|
||||
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
|
||||
|
||||
<meta name="theme-color" content="#4BBC43">
|
||||
<!-- 메인 아이콘 (512x512 PNG) -->
|
||||
<!-- <link rel="icon" href="/icon-512.png" sizes="512x512"> -->
|
||||
<link rel="icon" sizes="512x512"><!-- TODO : href="" -->
|
||||
<!-- iOS 홈화면 -->
|
||||
<!-- <link rel="apple-touch-icon" href="/icon-512.png"> -->
|
||||
<link rel="apple-touch-icon"><!-- TODO : href="" -->
|
||||
<!-- PWA -->
|
||||
<link rel="manifest" href="/manifest.json">
|
||||
<link rel="icon" type="image/x-icon" /><!-- TODO : href="" -->
|
||||
<!--/* TODO : theme-color */-->
|
||||
|
||||
<link th:href="@{/static/assets/styles/style.css}" type="text/css" rel="stylesheet" />
|
||||
<script th:src="@{/static/assets/scripts/common.ui.plugin.js}"></script>
|
||||
|
||||
@@ -369,7 +369,6 @@
|
||||
errors.push({field: form.transferCategoryCode.value+"_value", message: '수입대상을 입력해주세요.'});
|
||||
}
|
||||
}
|
||||
if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '수입원을 입력해주세요.'});
|
||||
|
||||
if(form.count.value){
|
||||
if(!form.unitCode.value){
|
||||
@@ -559,7 +558,9 @@
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
|
||||
<li><p>수입원</p><span>${product.sourcePurpose}</span></li>
|
||||
${product.sourcePurpose != null && product.sourcePurpose != ''
|
||||
? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>`
|
||||
: ''}
|
||||
${tagCount}
|
||||
<li><p>현금</p><span>${format(product.price)}원</span></li>
|
||||
</ul>
|
||||
|
||||
@@ -86,12 +86,16 @@
|
||||
<!-- transferCategory+Text-->
|
||||
<th:block th:each="item : ${transferCategoryList}">
|
||||
<div class="component-input " th:data-option="${item.codeText}">
|
||||
<div class="input-field">
|
||||
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'" value="" placeholder="수입 대상을 입력해 주세요." maxlength="30">
|
||||
<div class="input-field" th:if="${item.id != 'code.bank.input.10' and item.id != 'code.bank.input.12' and item.id != 'code.bank.input.13'}">
|
||||
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'"
|
||||
value="" maxlength="30"
|
||||
th:placeholder="${item.id == 'code.bank.input.self' ? '수입의 종류를 입력해 주세요.' : '수입 대상을 입력해 주세요.'}">
|
||||
</div>
|
||||
<th:block th:if="${item.id == 'code.bank.input.1' or item.id == 'code.bank.input.4'}">
|
||||
<ul class="guide-info" th:if="${item.msgCode}">
|
||||
<li class="txt-blue" th:text="${item.msgCode}"></li>
|
||||
</ul>
|
||||
</th:block>
|
||||
</div>
|
||||
</th:block>
|
||||
</div>
|
||||
@@ -100,7 +104,6 @@
|
||||
<div class="input-label">
|
||||
<label for="sourcePurpose" class="label-txt">
|
||||
수입원
|
||||
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
|
||||
@@ -361,7 +361,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '용도 입력해주세요.'});
|
||||
if(form.count.value){
|
||||
if(!form.unitCode.value){
|
||||
errors.push({
|
||||
@@ -552,7 +551,9 @@
|
||||
${buttonGroupHtml}
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li><p>용도</p><span>${product.sourcePurpose}</span></li>
|
||||
${product.sourcePurpose != null && product.sourcePurpose != ''
|
||||
? `<li><p>용도</p><span>${product.sourcePurpose}</span></li>`
|
||||
: ''}
|
||||
${tagCount}
|
||||
<li><p>현금</p><span>${format(product.price)}원</span></li>
|
||||
</ul>
|
||||
|
||||
@@ -63,7 +63,6 @@
|
||||
<div class="input-label">
|
||||
<label for="sourcePurpose" class="label-txt">
|
||||
용도
|
||||
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
</p>
|
||||
</div>
|
||||
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
|
||||
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
|
||||
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<strong>지출 내역 [[${#lists.isEmpty(expenseList) ? 0 : #lists.size(expenseList)}]]건 등록</strong> <br>
|
||||
되었습니다.
|
||||
</h3>
|
||||
<p th:if="${#lists.isEmpty(expenseList)}">지출 내역을 등록해 주세요..</p>
|
||||
<p th:if="${#lists.isEmpty(expenseList)}">지출 내역을 등록해 주세요.</p>
|
||||
<p th:unless="${#lists.isEmpty(expenseList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
||||
</hgroup>
|
||||
|
||||
@@ -140,10 +140,6 @@
|
||||
<section layout:fragment="script">
|
||||
<script th:src="@{/static/ui/page/daily-record.js}"></script>
|
||||
<script th:inline="javascript">
|
||||
$(function() {
|
||||
formControl.init();
|
||||
});
|
||||
|
||||
let ENV = {
|
||||
httpUrl: {
|
||||
root: /*[[|/record/daily/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
</p>
|
||||
</div>
|
||||
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
|
||||
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
|
||||
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
|
||||
@@ -3,19 +3,11 @@
|
||||
xmlns:th="http://www.thymeleaf.org" lang="ko">
|
||||
|
||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||
[[${dailyRecord.registrable}]]
|
||||
[[${moveStep}]],
|
||||
[[${dailyRecord.modifiable}]]
|
||||
--
|
||||
[[${(not dailyRecord.modifiable)}]]
|
||||
|
||||
<main id="content" role="main"
|
||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||
, btnDisabled=${(not btnActive)
|
||||
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
|
||||
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
|
||||
|
||||
[[${btnActive}]], [[${btnDisabled}]], [[${btnIcoClass}]]
|
||||
<div class="inner">
|
||||
<hgroup class="tit-group">
|
||||
<h3>
|
||||
@@ -151,10 +143,6 @@
|
||||
<section layout:fragment="script">
|
||||
<script th:src="@{/static/ui/page/daily-record.js}"></script>
|
||||
<script th:inline="javascript">
|
||||
$(function() {
|
||||
formControl.init();
|
||||
});
|
||||
|
||||
let ENV = {
|
||||
httpUrl: {
|
||||
root: /*[[|/record/farming/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
</p>
|
||||
</div>
|
||||
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
|
||||
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
|
||||
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
|
||||
@@ -143,10 +143,6 @@
|
||||
<section layout:fragment="script">
|
||||
<script th:src="@{/static/ui/page/daily-record.js}"></script>
|
||||
<script th:inline="javascript">
|
||||
$(function() {
|
||||
formControl.init();
|
||||
});
|
||||
|
||||
let ENV = {
|
||||
httpUrl: {
|
||||
root: /*[[|/record/forestry/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
</p>
|
||||
</div>
|
||||
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
|
||||
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
|
||||
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
|
||||
@@ -10,13 +10,6 @@
|
||||
<div>
|
||||
detail: [[${dailyRecord}]]
|
||||
</div>
|
||||
<div>
|
||||
[[${dailyRecord.registrable}]]
|
||||
[[${moveStep}]],
|
||||
[[${dailyRecord.modifiable}]]
|
||||
<br>
|
||||
//http://localhost:8080/record/income/202505/12?type=step1&target=income
|
||||
</div>
|
||||
</th:block>
|
||||
<main id="content" role="main"
|
||||
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
|
||||
@@ -162,10 +155,6 @@
|
||||
<section layout:fragment="script">
|
||||
<script th:src="@{/static/ui/page/daily-record.js}"></script>
|
||||
<script th:inline="javascript">
|
||||
$(function() {
|
||||
formControl.init();
|
||||
});
|
||||
|
||||
let ENV = {
|
||||
httpUrl: {
|
||||
root: /*[[|/record/daily/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',
|
||||
|
||||
@@ -128,10 +128,6 @@
|
||||
<section layout:fragment="script">
|
||||
<script th:src="@{/static/ui/page/daily-record.js}"></script>
|
||||
<script th:inline="javascript">
|
||||
$(function() {
|
||||
formControl.init();
|
||||
});
|
||||
|
||||
let ENV = {
|
||||
httpUrl: {
|
||||
root: /*[[|/record/power/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
</div>
|
||||
<div id="areaUnitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요"
|
||||
data-props-type="bottomSheet">
|
||||
<input type="hidden" name="areaUnitCode" th:value="${detail.areaUnitCode}">
|
||||
<input type="hidden" name="areaUnitCode" data-type="select" th:value="${detail.areaUnitCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
@@ -104,7 +104,6 @@
|
||||
<div class="input-label">
|
||||
<label for="harvestQuantity" class="label-txt">
|
||||
수확량
|
||||
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
@@ -120,7 +119,7 @@
|
||||
</div>
|
||||
<div id="harvestUnitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요"
|
||||
data-props-type="bottomSheet">
|
||||
<input type="hidden" name="harvestUnitCode" th:value="${detail.harvestUnitCode}">
|
||||
<input type="hidden" name="harvestUnitCode" data-type="select" th:value="${detail.harvestUnitCode}">
|
||||
<button type="button" class="select-box">
|
||||
<span class="select-txt"></span>
|
||||
</button>
|
||||
|
||||
@@ -189,10 +189,6 @@
|
||||
<section layout:fragment="script">
|
||||
<script th:src="@{/static/ui/page/daily-record.js}"></script>
|
||||
<script th:inline="javascript">
|
||||
$(function() {
|
||||
formControl.init();
|
||||
});
|
||||
|
||||
let ENV = {
|
||||
httpUrl: {
|
||||
root: /*[[|/record/work/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" maxlength="4">
|
||||
<input type="password" inputmode="numeric" maxlength="4" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요">
|
||||
</div>
|
||||
<ul class="input-info" id="password-error" style="display: none;">
|
||||
<li>비밀번호를 입력해주세요</li>
|
||||
|
||||
Reference in New Issue
Block a user