Merge branch 'dev' into 'deploy-dev-front'
Dev See merge request korea-research/korea-research!52
This commit is contained in:
@@ -0,0 +1,56 @@
|
||||
package app.module.front.config.application.security;
|
||||
|
||||
import app.module.core.config.application.enums.AppType;
|
||||
import app.module.core.config.application.util.CommonUtil;
|
||||
import app.module.core.usecase.loggedinuser.save.ports.LoggedInUserSavePortIn;
|
||||
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserIdSaveCmd;
|
||||
import app.module.core.usecase.loggedinuser.save.ports.application.domain.LoggedInUserSaveCmd;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
|
||||
import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class FrontAuthSuccessEvent {
|
||||
|
||||
private final LoggedInUserSavePortIn loggedInUserSavePortIn;
|
||||
|
||||
|
||||
@EventListener
|
||||
public void handleAuthenticationSuccessEvent(AuthenticationSuccessEvent event) {
|
||||
Authentication authentication = event.getAuthentication();
|
||||
FrontHouseholdUser householdUser = (FrontHouseholdUser) authentication.getPrincipal();
|
||||
|
||||
HttpServletRequest request =
|
||||
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||
// 로그인 이력 쌓기
|
||||
loggedInUserSavePortIn.connect(
|
||||
LoggedInUserSaveCmd.builder()
|
||||
.loggedInUserId(
|
||||
LoggedInUserIdSaveCmd.builder()
|
||||
.appType(AppType.FRONT)
|
||||
.id(authentication.getName())
|
||||
.build())
|
||||
.clientIP(CommonUtil.getClientIP(request))
|
||||
.lastLoggedInAt(LocalDateTime.now())
|
||||
.build());
|
||||
|
||||
}
|
||||
|
||||
@EventListener
|
||||
public void handleAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
|
||||
Exception e = event.getException();
|
||||
Authentication authentication = event.getAuthentication();
|
||||
log.warn("Unsuccessful authentication result: {}", authentication, e);
|
||||
}
|
||||
}
|
||||
@@ -77,7 +77,6 @@ public class DailyRecordController {
|
||||
|
||||
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq());
|
||||
|
||||
// TODO : true / false 를 업데이트하는 것은 대상 타켓이 되는 것이라 판단하여 그냥 강제 업데이트할 것인가? valid 체크
|
||||
dailyRecordPortIn.updateByStatus(detail.getRecordMonth(), detail.getGroupNo(), reqVO.getHouseholdSeq(), targetType, "Y".equals(targetStatus) ? DailyTargetStatus.TODAY_NONE.name() : DailyTargetStatus.TARGET.name());
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
||||
|
||||
@@ -246,10 +246,15 @@ kri.form.error = function(errorList){
|
||||
}
|
||||
}
|
||||
|
||||
kri.form.maxlength = function(object){
|
||||
if (object.value.length > object.maxLength) {
|
||||
object.value = object.value.slice(0, object.maxLength);
|
||||
}
|
||||
}
|
||||
|
||||
$(function() {
|
||||
$('body').on('input', 'input[type="number"]', function() {
|
||||
let $el = $(this);
|
||||
if ($el.val().length > $el.attr('maxlength')) {
|
||||
$el.val($el.val().slice(0, $el.attr('maxlength')));
|
||||
}
|
||||
|
||||
if ($el.attr('inputmode') === 'numeric') {
|
||||
$el.val($el.val().replace('.', ''));
|
||||
}
|
||||
})
|
||||
})
|
||||
@@ -120,8 +120,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 2, 2.5</li>
|
||||
@@ -181,8 +181,8 @@
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" id="price" name="price" placeholder="금액을 입력해 주세요"
|
||||
class="limitAmountLength"
|
||||
maxlength="10" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
|
||||
class="limitAmountLength" min="1" max="9999999999"
|
||||
maxlength="10" inputmode="numeric" pattern="[0-9]*" >
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="input-info" style="display:none">
|
||||
|
||||
@@ -83,8 +83,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
<input type="number" id="count" placeholder="수량을 입력해 주세요" name="count" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 2, 2.5</li>
|
||||
@@ -145,9 +145,9 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" id="price" placeholder="금액을 입력해 주세요" name="price"
|
||||
<input type="number" id="price" placeholder="금액을 입력해 주세요" name="price" min="1" max="9999999999"
|
||||
class="limitAmountLength"
|
||||
maxlength="10" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
|
||||
maxlength="10" inputmode="numeric" pattern="[0-9]*" >
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="input-info" style="display:none">
|
||||
|
||||
@@ -62,8 +62,8 @@
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="availableArea" placeholder="가능 면적을 입력해 주세요"
|
||||
name="availableArea" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
name="availableArea" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@@ -96,8 +96,8 @@
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="landArea" placeholder="작업 면적을 입력해 주세요"
|
||||
name="landArea" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
name="landArea" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 180, 6</li>
|
||||
@@ -117,8 +117,8 @@
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="mainYield" placeholder="수확량을 입력해 주세요"
|
||||
name="mainYield" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
name="mainYield" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -176,8 +176,8 @@
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="mainSaleAmount" placeholder="판매량을 입력해 주세요"
|
||||
name="mainSaleAmount" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
name="mainSaleAmount" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -235,8 +235,8 @@
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="subYield" placeholder="수확량을 입력해 주세요"
|
||||
name="subYield" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
name="subYield" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -294,8 +294,8 @@
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" id="subSaleAmount" placeholder="판매량을 입력해 주세요"
|
||||
name="subSaleAmount" class="limitDecimalLength"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" oninput="kri.form.maxlength(this)">
|
||||
name="subSaleAmount" class="limitDecimalLength" min="1" max="9999999999"
|
||||
inputmode="decimal" pattern="[0-9]*" maxlength="10" >
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -85,14 +85,14 @@
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="number" th:field="*{tel2}"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)"/>
|
||||
<input type="number" th:field="*{tel2}" min="0" max="9999"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="number" th:field="*{tel3}"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)"/>
|
||||
<input type="number" th:field="*{tel3}" min="0" max="9999"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -113,14 +113,14 @@
|
||||
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="number" id="temp_input_0006" th:field="*{phone2}"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
|
||||
<input type="number" id="temp_input_0006" th:field="*{phone2}" min="0" max="9999"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" >
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field">
|
||||
<input type="number" id="temp_input_0007" th:field="*{phone3}"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
|
||||
<input type="number" id="temp_input_0007" th:field="*{phone3}" min="0" max="9999"
|
||||
maxlength="4" inputmode="numeric" pattern="[0-9]*" >
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
<p>[[${child.itemName}]]</p>
|
||||
<span>
|
||||
<span>[[${child.workName}]]</span>
|
||||
<span>총 [[${child.totalHour}]]시간</span>
|
||||
<span>총 [[${@dailyUtil.getStringComma(child.totalHour)}]]시간</span>
|
||||
</span>
|
||||
</li>
|
||||
</th:block>
|
||||
@@ -109,9 +109,9 @@
|
||||
<li>
|
||||
<p>[[${child.equipmentName}]]</p>
|
||||
<span th:if="${not #strings.isEmpty(child.ownedHours)}"
|
||||
th:text="|총 ${#numbers.formatInteger(child.ownedHours, 1, 'COMMA')}시간|">총8시간</span>
|
||||
th:text="|총 ${@dailyUtil.getStringComma(child.ownedHours)}시간|">총8시간</span>
|
||||
<span th:if="${not #strings.isEmpty(child.leasedHours)}"
|
||||
th:text="|총 ${#numbers.formatInteger(child.leasedHours, 1, 'COMMA')}시간|">총8시간</span>
|
||||
th:text="|총 ${@dailyUtil.getStringComma(child.leasedHours)}시간|">총8시간</span>
|
||||
</li>
|
||||
</th:block>
|
||||
</ul>
|
||||
|
||||
@@ -79,8 +79,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
|
||||
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" min="1" max="9999999999"
|
||||
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 2, 2.5</li>
|
||||
@@ -134,8 +134,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price"
|
||||
th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price" min="1" max="9999999999"
|
||||
th:value="${detail.price}" maxlength="10" placeholder="금액을 입력해 주세요">
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
@@ -151,8 +151,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" min="1" max="9999999999"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.quantity)}">
|
||||
<p>수량</p>
|
||||
<span th:text="|${item.quantity}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.quantity)}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.price)}">
|
||||
<p>현금 </p>
|
||||
|
||||
@@ -66,8 +66,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
|
||||
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" min="1" max="9999999999"
|
||||
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 2, 2.5</li>
|
||||
@@ -121,8 +121,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" min="1" max="9999999999"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.quantity)}">
|
||||
<p>수량</p>
|
||||
<span th:text="|${item.quantity}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.quantity)}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.estimatedValue)}">
|
||||
<p>현물평가액</p>
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
|
||||
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" min="1" max="9999999999"
|
||||
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 2, 2.5</li>
|
||||
@@ -96,8 +96,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" min="1" max="9999999999"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.quantity)}">
|
||||
<p>수량</p>
|
||||
<span th:text="|${item.quantity}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.quantity)}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.estimatedValue)}">
|
||||
<p>현물평가액</p>
|
||||
|
||||
@@ -109,8 +109,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity"
|
||||
th:value="${detail.quantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수량을 입력해 주세요">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="quantity" name="quantity" min="1" max="9999999999"
|
||||
th:value="${detail.quantity}" maxlength="10" placeholder="수량을 입력해 주세요">
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 2, 2.5</li>
|
||||
@@ -164,8 +164,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price"
|
||||
th:value="${detail.price}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="price" name="price" step="0" min="1" max="9999999999"
|
||||
th:value="${detail.price}" maxlength="10" placeholder="금액을 입력해 주세요">
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
@@ -181,8 +181,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-price">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="금액을 입력해 주세요">
|
||||
<input type="number" inputmode="numeric" pattern="[0-9]*" id="estimatedValue" name="estimatedValue" step="0" min="1" max="9999999999"
|
||||
th:value="${detail.estimatedValue}" maxlength="10" placeholder="금액을 입력해 주세요">
|
||||
<span class="input-field-txt">원</span>
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.quantity)}">
|
||||
<p>수량</p>
|
||||
<span th:text="|${item.quantity}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.quantity)}${#strings.defaultString(item.unitLabel,'')}|">500g</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.price)}">
|
||||
<p>현금 </p>
|
||||
|
||||
@@ -45,8 +45,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-hour">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours"
|
||||
th:value="${detail.ownedHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownedHours" name="ownedHours" min="1" max="9999999999"
|
||||
th:value="${detail.ownedHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -58,8 +58,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-hour">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="leasedHours"
|
||||
th:value="${detail.leasedHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="leasedHours" name="leasedHours" min="1" max="9999999999"
|
||||
th:value="${detail.leasedHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -68,11 +68,11 @@
|
||||
<ul class="detail-list">
|
||||
<li th:if="${not #strings.isEmpty(item.ownedHours)}">
|
||||
<p>자가 사용시간</p>
|
||||
<span th:text="|${item.ownedHours}시간|">0시간</span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.ownedHours)}시간|">0시간</span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.leasedHours)}">
|
||||
<p>임차 사용시간</p>
|
||||
<span th:text="|${item.leasedHours}시간|">0시간</span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.leasedHours)}시간|">0시간</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -51,8 +51,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="workLandArea" name="workLandArea"
|
||||
th:value="${detail.workLandArea}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="작업 면적을 입력해 주세요">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="workLandArea" name="workLandArea" min="1" max="9999999999"
|
||||
th:value="${detail.workLandArea}" maxlength="10" placeholder="작업 면적을 입력해 주세요">
|
||||
</div>
|
||||
<ul class="guide-info">
|
||||
<li>예 : 180, 6</li>
|
||||
@@ -108,8 +108,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="harvestQuantity" name="harvestQuantity"
|
||||
th:value="${detail.harvestQuantity}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="수확량을 입력해 주세요">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="harvestQuantity" name="harvestQuantity" min="1" max="9999999999"
|
||||
th:value="${detail.harvestQuantity}" maxlength="10" placeholder="수확량을 입력해 주세요">
|
||||
</div>
|
||||
</div>
|
||||
<div class="select-group">
|
||||
@@ -173,8 +173,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-hour">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownerTime" name="ownerTime"
|
||||
th:value="${detail.ownerTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="ownerTime" name="ownerTime" min="1" max="9999999999"
|
||||
th:value="${detail.ownerTime}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -186,8 +186,8 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="input-field type-hour">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="spouseTime" name="spouseTime"
|
||||
th:value="${detail.spouseTime}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="spouseTime" name="spouseTime" min="1" max="9999999999"
|
||||
th:value="${detail.spouseTime}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -201,16 +201,16 @@
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">남</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyMHours" name="familyMHours"
|
||||
th:value="${detail.familyMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyMHours" name="familyMHours" min="1" max="9999999999"
|
||||
th:value="${detail.familyMHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">여</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyFHours" name="familyFHours"
|
||||
th:value="${detail.familyFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="familyFHours" name="familyFHours" min="1" max="9999999999"
|
||||
th:value="${detail.familyFHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -226,16 +226,16 @@
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">남</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredMHours" name="hiredMHours"
|
||||
th:value="${detail.hiredMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredMHours" name="hiredMHours" min="1" max="9999999999"
|
||||
th:value="${detail.hiredMHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">여</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredFHours" name="hiredFHours"
|
||||
th:value="${detail.hiredFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="hiredFHours" name="hiredFHours" min="1" max="9999999999"
|
||||
th:value="${detail.hiredFHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -251,16 +251,16 @@
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">남</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedMHours" name="sharedMHours"
|
||||
th:value="${detail.sharedMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedMHours" name="sharedMHours" min="1" max="9999999999"
|
||||
th:value="${detail.sharedMHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">여</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedFHours" name="sharedFHours"
|
||||
th:value="${detail.sharedFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="sharedFHours" name="sharedFHours" min="1" max="9999999999"
|
||||
th:value="${detail.sharedFHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -276,16 +276,16 @@
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">남</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerMHours" name="volunteerMHours"
|
||||
th:value="${detail.volunteerMHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerMHours" name="volunteerMHours" min="1" max="9999999999"
|
||||
th:value="${detail.volunteerMHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="component-input">
|
||||
<div class="input-field type-hour">
|
||||
<span class="input-front-txt">여</span>
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerFHours" name="volunteerFHours"
|
||||
th:value="${detail.volunteerFHours}" maxlength="10" oninput="kri.form.maxlength(this)" placeholder="00">
|
||||
<input type="number" inputmode="decimal" pattern="[0-9]*" id="volunteerFHours" name="volunteerFHours" min="1" max="9999999999"
|
||||
th:value="${detail.volunteerFHours}" maxlength="10" placeholder="00">
|
||||
<span class="input-field-txt">시간</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -80,51 +80,51 @@
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.workLandArea)}">
|
||||
<p>작업 면적</p>
|
||||
<span th:text="|${item.workLandArea}${#strings.defaultString(item.areaUnitLabel,'')}|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.workLandArea)}${#strings.defaultString(item.areaUnitLabel,'')}|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.harvestQuantity)}">
|
||||
<p>수확량</p>
|
||||
<span th:text="|${item.harvestQuantity}${#strings.defaultString(item.harvestUnitLabel,'')}|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.harvestQuantity)}${#strings.defaultString(item.harvestUnitLabel,'')}|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.ownerTime)}">
|
||||
<p>경영주 노동투입시간</p>
|
||||
<span th:text="|${item.ownerTime}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.ownerTime)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.spouseTime)}">
|
||||
<p>배우자 노동투입시간</p>
|
||||
<span th:text="|${item.spouseTime}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.spouseTime)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.familyMHours)}">
|
||||
<p>가족노동(남)</p>
|
||||
<span th:text="|${item.familyMHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.familyMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.familyFHours)}">
|
||||
<p>가족노동(여)</p>
|
||||
<span th:text="|${item.familyFHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.familyFHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.hiredMHours)}">
|
||||
<p>고용노동(남)</p>
|
||||
<span th:text="|${item.hiredMHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.hiredMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.hiredFHours)}">
|
||||
<p>고용노동(여)</p>
|
||||
<span th:text="|${item.hiredFHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.hiredFHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.sharedMHours)}">
|
||||
<p>품앗이(남)</p>
|
||||
<span th:text="|${item.sharedMHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.sharedMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.sharedFHours)}">
|
||||
<p>품앗이(여)</p>
|
||||
<span th:text="|${item.sharedFHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.sharedFHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.volunteerMHours)}">
|
||||
<p>일손돕기(남)</p>
|
||||
<span th:text="|${item.volunteerMHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.volunteerMHours)}시간|"></span>
|
||||
</li>
|
||||
<li th:if="${not #strings.isEmpty(item.volunteerFHours)}">
|
||||
<p>일손돕기(여)</p>
|
||||
<span th:text="|${item.volunteerFHours}시간|"></span>
|
||||
<span th:text="|${@dailyUtil.getStringComma(item.volunteerFHours)}시간|"></span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user