diff --git a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java index 69fb5988..facc7e53 100644 --- a/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/bankUI/getBankInputUI/adapters/web/GetBankInputUIController.java @@ -1,5 +1,6 @@ package app.module.front.usecase.info.bankUI.getBankInputUI.adapters.web; +import app.module.core.config.application.enums.MonthStatus; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.info.monthly.getMonthlyInputStatus.ports.GetMonthlyInputStatusPortIn; @@ -55,7 +56,9 @@ class GetBankInputUIController { id, AuthUtil.getUserSeq())).orElse(null); //수정 가능 여부 판단 - YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth()); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); + YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter); + LocalDate maxMonth = yearMonth.plusMonths(1).atDay(15); LocalDate today = LocalDate.now(); boolean editable = !today.isAfter(maxMonth); @@ -68,6 +71,7 @@ class GetBankInputUIController { model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop")); model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit")); + model.addAttribute("MonthStatus", MonthStatus.class); model.addAttribute("editable", editable); diff --git a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java index cf3cc173..1798ed91 100644 --- a/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/monthlyUI/createMonthlyUI/adapters/web/CreateMonthlyUIController.java @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import java.time.LocalDate; import java.time.YearMonth; +import java.time.format.DateTimeFormatter; import java.util.NoSuchElementException; @Controller @@ -104,7 +105,8 @@ class CreateMonthlyUIController { } //수정 가능 여부 판단 - YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth()); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM"); + YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter); LocalDate maxMonth = yearMonth.plusMonths(1).atDay(15); LocalDate today = LocalDate.now(); boolean editable = !today.isAfter(maxMonth); diff --git a/front/src/main/resources/templates/info/monthly/{id}.html b/front/src/main/resources/templates/info/monthly/{id}.html index adad9f43..f294c9bc 100644 --- a/front/src/main/resources/templates/info/monthly/{id}.html +++ b/front/src/main/resources/templates/info/monthly/{id}.html @@ -44,9 +44,7 @@ @@ -592,16 +590,14 @@ }, //숫자입력 bindDecimalLimit() { - document.addEventListener("DOMContentLoaded", () => { - document.querySelectorAll(".limitDecimalLength").forEach(input => { - input.addEventListener("input", () => { - let val = input.value.replace(/[^0-9.]/g, ''); - const parts = val.split('.'); - if (parts.length > 2) val = parts[0] + '.' + parts.slice(1).join(''); - if (parts[1]) parts[1] = parts[1].slice(0, 2); - if (val.length > 10) val = val.slice(0, 10); - input.value = parts.join('.'); - }); + document.querySelectorAll(".limitDecimalLength").forEach(input => { + input.addEventListener("input", () => { + let val = input.value.replace(/[^0-9.]/g, ''); + const parts = val.split('.'); + if (parts.length > 2) val = parts[0] + '.' + parts.slice(1).join(''); + if (parts[1]) parts[1] = parts[1].slice(0, 2); + if (val.length > 10) val = val.slice(0, 10); + input.value = parts.join('.'); }); }); },