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 66d69481..4cdce78c 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 @@ -43,9 +43,16 @@ public class CreateDailyWorkValidator implements Validator { && vo.getHiredMHours() == null && vo.getHiredFHours() == null && vo.getSharedMHours() == null && vo.getSharedFHours() == null && vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) { - errors.rejectValue( - "ownerTime", "valid.common.required", - "최소 1개의 항목을 입력해주세요."); + errors.rejectValue("ownerTime", "valid.common.required"); + errors.rejectValue("spouseTime", "valid.common.required"); + errors.rejectValue("familyMHours", "valid.common.required"); + errors.rejectValue("familyFHours", "valid.common.required"); + errors.rejectValue("hiredMHours", "valid.common.required"); + errors.rejectValue("hiredFHours", "valid.common.required"); + errors.rejectValue("sharedMHours", "valid.common.required"); + errors.rejectValue("sharedFHours", "valid.common.required"); + errors.rejectValue("volunteerMHours", "valid.common.required"); + errors.rejectValue("volunteerFHours", "valid.common.required"); } } } diff --git a/front/src/main/resources/static/ui/ajaxUtil.js b/front/src/main/resources/static/ui/ajaxUtil.js index e513e9e2..87bbe7cb 100644 --- a/front/src/main/resources/static/ui/ajaxUtil.js +++ b/front/src/main/resources/static/ui/ajaxUtil.js @@ -163,14 +163,13 @@ var ajaxUtil = { kri.logger.error('statusCode: 403'); }, 422:function(rstData, status) { - console.log(rstData) + console.log('422', rstData) /** * TODO * 폼이 너무 여러가지 형식이 있는데 서버에러를 가지고 처리하는게 맞는지 검토 필요 * 코드 정리는 나중에 하려고 그냥 만듬.... 정리 필요. */ - let isResetDone = false; $(rstData.responseJSON.fieldErrors).each((idx, oj) => { @@ -241,6 +240,10 @@ var ajaxUtil = { if ($('.input-invalid').length != 0) { $('.input-invalid').eq(0).find('input,select').focus(); } + + if (typeof errorCallback !== 'undefined') { + errorCallback(rstData.status, rstData); + } }, 500:function(rstData){ ajaxUtil._hideWaiting(); @@ -268,6 +271,7 @@ var ajaxUtil = { }, error : function(rstData) { ajaxUtil._hideWaiting(); + if (!(rstData.status == 500 || rstData.status == 422)) { if (typeof errorCallback !== 'undefined') { errorCallback(rstData.status, rstData); diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index 49db622c..a49e5fc5 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -258,6 +258,12 @@ function (rstData, status) { location.reload(); }, + function () { + // 노동투입시간 invalid reset + $('.segment-label .guide-info li').eq(2).addClass('invalid'); + $('.type-sub').find('.input-info').remove(); + $('.input-flex-group').find('.input-info').remove(); + } ); }, };