diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java index 55d01c9d..ba32b5ba 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java @@ -4,13 +4,10 @@ import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adap import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; - @Slf4j @Service @RequiredArgsConstructor @@ -29,11 +26,11 @@ public class CreateDailyIncomeDao implements CreateDailyIncomePortOut { if (existCount == 0) { dailyIncomeMapper.createDailyIncome(command); - log.debug("[CreateDailyIncome] record={}", command); + log.debug("[CreateDailyIncome] command={}", command); } else { dailyIncomeMapper.updateDailyIncome(command); - log.debug("[UpdateDailyIncome] record={}", command); + log.debug("[UpdateDailyIncome] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java index 5217b279..93436d4d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal; +import app.module.core.config.application.enums.DailyInputType; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import lombok.Setter; public class GetDailyIncomeDto { private Long id; private Long dailyRecordSeq; - private String inputType; // TODO DailyInputType + private DailyInputType inputType; private Boolean credit; private String cropCode; private String cropLabel; @@ -20,12 +21,4 @@ public class GetDailyIncomeDto { private String unitSelf; private Long price; private Long estimatedValue; - - /** - * 수정 가능 여부 - * @return true=가능, false=불가능(등록 상태) - */ - public boolean isUpdated() { - return this.id != null && this.id != 0L; - } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java index 1aae7844..cb6dbfd4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java @@ -3,13 +3,11 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ada import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator.CreateDailyIncomeValidator; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -29,14 +27,21 @@ public class CreateDailyIncomeController { private final CreateDailyIncomePortIn dailyIncomePortIn; private final CreateDailyIncomeValidator createValidator; + /** + * 일계부 수입 조회 + * + * @param id 수입 일련번호 + * @param reqVO 검색 조건 + */ @GetMapping(path = "/{id}") ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) { reqVO.setId(Long.parseLong(id)); - //DailyRecordDto dailyRecord = this.vaildGetDailyRecord(reqVO.getSearchMonth(), reqVO.getGroupNo()); - GetDailyIncomeDto detail = dailyIncomePortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } return ResponseEntity.status(HttpStatus.OK).body(detail); } @@ -44,28 +49,26 @@ public class CreateDailyIncomeController { /** * 일계부 수입 등록 처리 * - * @param searchMonth 검색 월(yyyyMM) - * @param groupNo 검색 그룹 * @param id 수입 일련번호 * @param formVO 입력 데이터 * @param bindingResult BindingResult */ @PostMapping(path = "/{id}") - ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @PathVariable("id") String id + ResponseEntity create(@PathVariable("id") String id , @Valid @RequestBody CreateDailyIncomeReqVO formVO, BindingResult bindingResult) { createValidator.validate(formVO, bindingResult); if (bindingResult.hasErrors()) { - return coreUtil.getErrorInfo(bindingResult); + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); } - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, null); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); - formVO.setSearchMonth(searchMonth); - formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setId(Long.parseLong(id)); - formVO.setDailyRecordSeq(dailyRecord.getId()); + formVO.setDailyId(dailyRecord.getId()); log.debug("formVO: {}", formVO); dailyIncomePortIn.create(formVO); @@ -73,18 +76,13 @@ public class CreateDailyIncomeController { return ResponseEntity.status(HttpStatus.OK).body(formVO); } - /** * 일계부 유효성 체크 및 데이터 조회 * - * @param searchMonth 검색 월(yyyyMM) - * @param groupNo 검색 그룹 + * @param dailyRecordSeq 항목 일련번호 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, Integer groupNo) { - DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); - log.debug("getRecordUIReq: {}", reqVO); - - DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq()); + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); if (dailyRecord == null || dailyRecord.getId() == null) { throw new NoRecordDataException(); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java index 37356cb7..23a2648c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java @@ -1,6 +1,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.core.config.application.enums.DailyInputType; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; @@ -9,15 +9,7 @@ import lombok.ToString; @Getter @Setter @ToString(callSuper = true) -public class CreateDailyIncomeReqVO extends DailyUIReqVO { - /** - * 수입 일련번호 - */ - private Long id; - /** - * 일계부 일련번호 - */ - private Long dailyRecordSeq; +public class CreateDailyIncomeReqVO extends DailyIncomeUIReqVO { /** * 등록 유형 */ diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java index 85865da9..3f3901d0 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java @@ -1,10 +1,8 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import lombok.Setter; -import lombok.ToString; -import org.apache.tika.utils.StringUtils; @Getter @Setter @@ -12,7 +10,7 @@ public class DailyIncomeUIReqVO { /** * 검색 월(yyyyMM) */ - private String recordMonth; + private String searchMonth; /** * 검색 그룸번호 */ @@ -21,11 +19,11 @@ public class DailyIncomeUIReqVO { * 임가 일련번호 */ private Long householdSeq; + /** * 일계부 항목 일련번호 */ private Long dailyId; - /** * 수입 일련번호 */ diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java deleted file mode 100644 index edc0203d..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; - -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import jakarta.validation.constraints.NotBlank; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@ToString(callSuper = true) -public class RemoveDailyIncomeReqVO extends DailyUIReqVO { - /** - * 수입 일련번호 - */ - @NotBlank(message = "{valid.common.required}") - private String id; - /** - * 일계부 일련번호 - */ - private Long dailyRecordSeq; -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java index 671b1da0..559c23cf 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java @@ -4,9 +4,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; - -import java.util.List; public interface CreateDailyIncomePortIn { /** diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java index edee8e4d..1d0af5d9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java @@ -4,16 +4,13 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; - -import java.util.List; public interface CreateDailyIncomePortOut { /** * 일계부 수입 조회 * * @param command 검색 조건 - * @return 수입 목록 + * @return 수입 상세 */ GetDailyIncomeDto detail(GetDailyIncomeCmd command); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java index eef1c25d..f9bb7db5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java @@ -3,32 +3,26 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; import app.module.core.config.application.util.AuditUtil; +import app.module.core.config.constants.DailyRecordConstants; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; -import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; - @Service @RequiredArgsConstructor public class CreateDailyIncomeService implements CreateDailyIncomePortIn { private final CreateDailyIncomePortOut portOut; - private final UICodeListPortIn uiCodeListPortIn; private final DailyRecordPortIn dailyRecordPortIn; @Override public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) { GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( - reqVO.getRecordMonth(), + reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq(), reqVO.getId()); @@ -36,24 +30,6 @@ public class CreateDailyIncomeService implements CreateDailyIncomePortIn { return portOut.detail(findCmd); } - /** - * 코드명 조회 - * - * @param codeId 코드 - * @param codeList 공통 코드 목록 - * @return 코드명 - */ - private String getCodeLabel(String codeId, List codeList) { - String returnValue = null; - for (UICodeElement codeSetup : codeList) { - if (codeSetup.getId().equalsIgnoreCase(codeId)) { - returnValue = codeSetup.getCodeText(); - break; - } - } - return returnValue; - } - @Override public void create(CreateDailyIncomeReqVO formVO) { GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( @@ -65,10 +41,10 @@ public class CreateDailyIncomeService implements CreateDailyIncomePortIn { CreateDailyIncomeCmd command = AuditUtil.create( new CreateDailyIncomeCmd( formVO.getId(), - formVO.getDailyRecordSeq(), + formVO.getDailyId(), formVO.getInputType(), - "1", // [정책] 1 고정 - (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 + DailyRecordConstants.INCOME_CATEGORY, + (formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null), formVO.getCredit(), formVO.getCropCode(), formVO.getIncomeKind(), diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java index 0bcf4094..5dcb3f31 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java @@ -1,7 +1,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyInputType; import app.module.core.config.adapters.persistence.component.AuditCommand; +import app.module.core.config.application.enums.DailyInputType; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java deleted file mode 100644 index c9674ced..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain; - -import app.module.core.config.adapters.persistence.component.AuditCommand; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@AllArgsConstructor -@ToString -public class RemoveDailyIncomeCmd extends AuditCommand { - private String searchMonth; - private Integer groupNo; - private Long id; - private Long dailyRecordSeq; -} diff --git a/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml b/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml index b29286b6..65b113ce 100644 --- a/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml +++ b/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml @@ -10,7 +10,7 @@ from daily_income ds where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/admin/src/main/resources/static/scripts/ajaxUtils.js b/admin/src/main/resources/static/scripts/ajaxUtils.js index 639fdf8a..d37cfd02 100644 --- a/admin/src/main/resources/static/scripts/ajaxUtils.js +++ b/admin/src/main/resources/static/scripts/ajaxUtils.js @@ -25,47 +25,17 @@ var ajaxUtil = { }, _alertError : function (code) { - var message = ajaxUtil._msg500; - if (code == '400') { + let message = ajaxUtil._msg500; + if (code === '400') { message = ajaxUtil._msg400; } + ajaxUtil._alert(message, '오류 안내'); }, - _alert : function (alertMessage, alertTitle, afterEvent) { - etUI.dialog.alert({ - title: alertTitle, - message: alertMessage, - type: "alert", - callback: function() { - console.log("alert callback"); - }, - }); - }, - _alertId : function (alertId, afterEvent) { - ajaxUtil._alertMethod({ - id: alertId, - title: null, - message: null, - after: afterEvent !== undefined ? (afterEvent ? 'Y' : 'N') : 'N', - }); - }, - _alertMethod : function (jsonObj) { - ajaxUtil._ajaxSyncNoWaiting( - '/m/common/alert', - jsonObj, - function(rstData) { - var $wrap = $('#bindWrap'); - if ($wrap.find('.ui-popup-common-alert').length != 0) { - $wrap.find('.ui-popup-common-alert').remove(); - } + _alert : function (alertMessage, alertTitle) { + console.warn(alertTitle) - $wrap.append(rstData); - uxgFn.popup.bind('.ui-popup-common-alert').open(); - }, - function(code, rstData) { - kri.logger.error('Do nothing. code: '+ code, rstData); - }, - 'html'); + alert(alertMessage); }, @@ -130,22 +100,22 @@ var ajaxUtil = { contentType : 'application/json; charset=UTF-8', async: async, statusCode : { + 400:function(){ + ajaxUtil._alertError(ajaxUtil.$400); + }, 404:function(rstData){ ajaxUtil._hideWaiting(); if (typeof errorCallback !== 'undefined') { errorCallback(ajaxUtil.$404, rstData); } else { - // kri.menu.main(); - kri.logger.error('statusCode: 404'); + console.error('statusCode: 404'); } }, 401:function(){ - // kri.menu.main(); - kri.logger.error('statusCode: 401'); + console.error('statusCode: 401'); }, 403:function(rstData){ - // kri.menu.main(); - kri.logger.error('statusCode: 403'); + console.error('statusCode: 403'); }, 422:function(rstData, status) { console.log(rstData); @@ -195,13 +165,15 @@ var ajaxUtil = { }, success : function(rstData, status) { ajaxUtil._hideWaiting(); + console.log('succ', rstData) if (typeof successCallback !== 'undefined') { successCallback(rstData, status); } }, error : function(rstData) { ajaxUtil._hideWaiting(); - if (!(rstData.status == 500 || rstData.status == 422)) { + console.log('error') + if (!(rstData.status == 500 || rstData.status == 422 || rstData.status == 400)) { if (typeof errorCallback !== 'undefined') { errorCallback(rstData.status, rstData); } else { diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-income.html b/admin/src/main/resources/templates/households/modal/modal-daily-income.html index e8b104a2..041b97c1 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-income.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html @@ -3,9 +3,12 @@ layout:decorate="~{layout/layout}">
-
- + + + + +