diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java index 89af3675..ff0a661b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeController.java @@ -39,7 +39,6 @@ public class DailyIncomeController { * @param id 수입 일련번호 * @param formVO 입력 데이터 * @param bindingResult BindingResult - * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}") ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo @@ -71,7 +70,6 @@ public class DailyIncomeController { * @param groupNo 검색 그룹 * @param formVO 입력 데이터 * @param bindingResult BindingResult - * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/remove") ResponseEntity remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo @@ -100,7 +98,6 @@ public class DailyIncomeController { * * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 - * @return */ @PostMapping(path = "/{searchMonth}/{groupNo}/reset") ResponseEntity removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) { @@ -123,7 +120,6 @@ public class DailyIncomeController { * * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 - * @return */ private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java index f819e05d..e98c8cca 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java @@ -6,7 +6,6 @@ import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatu import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; -import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,13 +23,12 @@ public class DailyRecordController { private final CreateDailyRecordValidator createDailyRecordValidator; /** - * 일계부 등록 처리 + * 일계부 항목 등록 처리 * - * @param searchMonth - * @param groupNo - * @param formVO - * @param bindingResult - * @return + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult */ @PostMapping(path = "/{searchMonth}/{groupNo}") ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo @@ -57,15 +55,21 @@ public class DailyRecordController { return ResponseEntity.status(HttpStatus.OK).body(reqVO); } + /** + * 일계부 금일 데이터 없음 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param targetType 처리 대상 + * @param targetStatus 처리 상태 + */ @PostMapping(path = "/{searchMonth}/{groupNo}/today-none") ResponseEntity todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo , @RequestParam(name = "target", required = true, defaultValue = "") String targetType , @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); - log.debug("reqVO: {}", reqVO); - log.debug("target: {}", targetType); - log.debug("status: {}", targetStatus); + log.debug("reqVO: {}, target: {}, status: {}", reqVO, targetType, targetStatus); DailyRecordDto detail = dailyRecordPortIn.detail(reqVO); diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java index 42c3f575..548327fb 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java @@ -23,7 +23,7 @@ public class DailyRecordUIController { private final CreateDailyRecordValidator createDailyRecordValidator; /** - * 일계부 등록 화면 + * 일계부 항목 등록 화면 * * @param model Model * @param searchMonth 검색 월(yyyyMM) @@ -44,11 +44,11 @@ public class DailyRecordUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); - return "record/daily"; + return "record/daily/index"; } /** - * 일계부 등록 완료(종료) 화면 + * 일계부 완료(종료) 화면 * * @param model Model * @param searchMonth 검색 월(yyyyMM) @@ -76,6 +76,4 @@ public class DailyRecordUIController { return modelAndView; } - - } 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 fb0a2975..bf650bc6 100644 --- a/front/src/main/resources/static/ui/page/daily-record.js +++ b/front/src/main/resources/static/ui/page/daily-record.js @@ -28,40 +28,22 @@ krip.daily.goToPrev = function() { * @param groupNo */ krip.daily.goToNext = function(target, searchMonth, groupNo) { + if (target === 'LAST') { + // 임가 건의사항 팝업 + const commentModal = document.querySelector('.commentModal').ui; + commentModal.open({ + beforeClose: function () { + krip.daily.createComment(searchMonth, groupNo); + }, + }); + return; + } + let url = krip.daily.httpUrl.target; url = url.replace('{month}', searchMonth); url = url.replace('{groupNo}', groupNo); url = url.replace('{target}', target.toLowerCase()); - if (target === 'LAST') { - alert('LAST'); - - const commentModal = document.querySelector('.commentModal').ui; - commentModal.open(); - - /* - commentModal.open({ - afterClose() { - console.log(1111) - } - }); - */ - - //modal02.afterClose - - /* - const $modal1 = document.querySelector('.modal02'); - const modalInstance1 = new etUI.components.Modal(); - modalInstance1.core.init($modal1, { - afterClose(){ - console.log('ssssssssssssss') - } - }); - */ - - return; - } - location.href = url; }; diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily/index.html similarity index 99% rename from front/src/main/resources/templates/record/daily.html rename to front/src/main/resources/templates/record/daily/index.html index bbce881e..821b10e7 100644 --- a/front/src/main/resources/templates/record/daily.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -114,7 +114,7 @@
- +