diff --git a/front/src/main/java/app/module/front/config/constants/CommonConstants.java b/front/src/main/java/app/module/front/config/constants/CommonConstants.java index edb03e6a..d961abbb 100644 --- a/front/src/main/java/app/module/front/config/constants/CommonConstants.java +++ b/front/src/main/java/app/module/front/config/constants/CommonConstants.java @@ -9,4 +9,9 @@ public class CommonConstants { * 단위의 직접입력 코드 */ public static final String UNIT_CODE_SELF = "code.record.unit.self"; + + /** + * 작업 면적의 직접입력 코드 + */ + public static final String AREA_CODE_OTHER = "code.record.area.self"; } diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java index 4b6c7271..67b37635 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.farming.adapters.web.validator; +import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; import lombok.RequiredArgsConstructor; import org.apache.tika.utils.StringUtils; @@ -20,7 +21,7 @@ public class CreateDailyFarmingValidator implements Validator { public void validate(Object target, Errors errors) { CreateDailyFarmingReqVO vo = (CreateDailyFarmingReqVO) target; - if ("SELF".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) { + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) { errors.rejectValue( "categorySelf", "valid.common.required", "생산물을 입력해 주세요."); diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java index 4cdce78c..1d01ff9d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/validator/CreateDailyWorkValidator.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.work.adapters.web.validator; +import app.module.front.config.constants.CommonConstants; import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO; import lombok.RequiredArgsConstructor; import org.apache.tika.utils.StringUtils; @@ -20,19 +21,37 @@ public class CreateDailyWorkValidator implements Validator { public void validate(Object target, Errors errors) { CreateDailyWorkReqVO vo = (CreateDailyWorkReqVO) target; - if (vo.getHarvestQuantity() == null) { + if (vo.getWorkLandArea() == null && !StringUtils.isBlank(vo.getAreaUnitCode())) { errors.rejectValue( - "harvestQuantity", "valid.common.required", - "수확량을 입력해 주세요."); + "workLandArea", "valid.common.required", + "작업 면적을 입력해 주세요."); } - if ("SELF".equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) { + if (vo.getWorkLandArea() != null && StringUtils.isBlank(vo.getAreaUnitCode())) { + errors.rejectValue( + "areaUnitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.AREA_CODE_OTHER.equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) { errors.rejectValue( "areaUnitSelf", "valid.common.required", "단위를 입력해 주세요."); } - if ("SELF".equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) { + if (vo.getHarvestQuantity() == null && !StringUtils.isBlank(vo.getHarvestUnitCode())) { + errors.rejectValue( + "harvestQuantity", "valid.common.required", + "수확량을 입력해 주세요."); + } + + if (vo.getHarvestQuantity() != null && StringUtils.isBlank(vo.getHarvestUnitCode())) { + errors.rejectValue( + "harvestUnitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) { errors.rejectValue( "harvestUnitSelf", "valid.common.required", "단위를 입력해 주세요."); diff --git a/front/src/main/resources/static/ui/ajaxUtil.js b/front/src/main/resources/static/ui/ajaxUtil.js index 87bbe7cb..bfa4aa42 100644 --- a/front/src/main/resources/static/ui/ajaxUtil.js +++ b/front/src/main/resources/static/ui/ajaxUtil.js @@ -223,7 +223,7 @@ var ajaxUtil = { infoBox = $('').appendTo(component); } - infoBox.html('
  • ' + oj.message + '1111
  • '); + infoBox.html('
  • ' + oj.message + '
  • '); } } diff --git a/front/src/main/resources/static/ui/page/daily-record.js b/front/src/main/resources/static/ui/page/daily-record.js index 353d3640..b5347fe0 100644 --- a/front/src/main/resources/static/ui/page/daily-record.js +++ b/front/src/main/resources/static/ui/page/daily-record.js @@ -95,8 +95,6 @@ krip.daily.baseBindUI = function() { //document.reqForm.todayNone.value = 'N'; $noneWrap.val('N'); } - // TODO 2번 이벤트 발생하는 원인 찾기 - console.log(1111) krip.daily.todayNone(ENV.month, ENV.groupNo, $noneWrap.data('type'), checked); }); diff --git a/front/src/main/resources/templates/record/expense/index.html b/front/src/main/resources/templates/record/expense/index.html index a339c6d6..95b8b5c9 100644 --- a/front/src/main/resources/templates/record/expense/index.html +++ b/front/src/main/resources/templates/record/expense/index.html @@ -20,7 +20,7 @@ 지출 내역 [[${#lists.isEmpty(expenseList) ? 0 : #lists.size(expenseList)}]]건 등록
    되었습니다. -

    지출 내역을 등록해 주세요..

    +

    지출 내역을 등록해 주세요.

    등록 내용을 확인하거나 다음 단계로 이동하세요.

    @@ -140,10 +140,6 @@