[FO] 임가 건의사항 이동 처리 수정
This commit is contained in:
@@ -39,7 +39,6 @@ public class DailyIncomeController {
|
|||||||
* @param id 수입 일련번호
|
* @param id 수입 일련번호
|
||||||
* @param formVO 입력 데이터
|
* @param formVO 입력 데이터
|
||||||
* @param bindingResult BindingResult
|
* @param bindingResult BindingResult
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
@PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
|
@PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}")
|
||||||
ResponseEntity<?> create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
ResponseEntity<?> create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||||
@@ -71,7 +70,6 @@ public class DailyIncomeController {
|
|||||||
* @param groupNo 검색 그룹
|
* @param groupNo 검색 그룹
|
||||||
* @param formVO 입력 데이터
|
* @param formVO 입력 데이터
|
||||||
* @param bindingResult BindingResult
|
* @param bindingResult BindingResult
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
@PostMapping(path = "/{searchMonth}/{groupNo}/remove")
|
@PostMapping(path = "/{searchMonth}/{groupNo}/remove")
|
||||||
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
ResponseEntity<?> remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||||
@@ -100,7 +98,6 @@ public class DailyIncomeController {
|
|||||||
*
|
*
|
||||||
* @param searchMonth 검색 월(yyyyMM)
|
* @param searchMonth 검색 월(yyyyMM)
|
||||||
* @param groupNo 검색 그룹
|
* @param groupNo 검색 그룹
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
@PostMapping(path = "/{searchMonth}/{groupNo}/reset")
|
@PostMapping(path = "/{searchMonth}/{groupNo}/reset")
|
||||||
ResponseEntity<?> removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) {
|
ResponseEntity<?> removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) {
|
||||||
@@ -123,7 +120,6 @@ public class DailyIncomeController {
|
|||||||
*
|
*
|
||||||
* @param searchMonth 검색 월(yyyyMM)
|
* @param searchMonth 검색 월(yyyyMM)
|
||||||
* @param groupNo 검색 그룹
|
* @param groupNo 검색 그룹
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
|
private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) {
|
||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
|
|||||||
@@ -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.model.DailyUIReqVO;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator;
|
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.DailyRecordPortIn;
|
||||||
import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd;
|
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -24,13 +23,12 @@ public class DailyRecordController {
|
|||||||
private final CreateDailyRecordValidator createDailyRecordValidator;
|
private final CreateDailyRecordValidator createDailyRecordValidator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 일계부 등록 처리
|
* 일계부 항목 등록 처리
|
||||||
*
|
*
|
||||||
* @param searchMonth
|
* @param searchMonth 검색 월(yyyyMM)
|
||||||
* @param groupNo
|
* @param groupNo 검색 그룹
|
||||||
* @param formVO
|
* @param formVO 입력 데이터
|
||||||
* @param bindingResult
|
* @param bindingResult BindingResult
|
||||||
* @return
|
|
||||||
*/
|
*/
|
||||||
@PostMapping(path = "/{searchMonth}/{groupNo}")
|
@PostMapping(path = "/{searchMonth}/{groupNo}")
|
||||||
ResponseEntity<?> create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String 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);
|
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 일계부 금일 데이터 없음 처리
|
||||||
|
*
|
||||||
|
* @param searchMonth 검색 월(yyyyMM)
|
||||||
|
* @param groupNo 검색 그룹
|
||||||
|
* @param targetType 처리 대상
|
||||||
|
* @param targetStatus 처리 상태
|
||||||
|
*/
|
||||||
@PostMapping(path = "/{searchMonth}/{groupNo}/today-none")
|
@PostMapping(path = "/{searchMonth}/{groupNo}/today-none")
|
||||||
ResponseEntity<?> todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
ResponseEntity<?> todayNone(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo
|
||||||
, @RequestParam(name = "target", required = true, defaultValue = "") String targetType
|
, @RequestParam(name = "target", required = true, defaultValue = "") String targetType
|
||||||
, @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) {
|
, @RequestParam(name = "status", required = false, defaultValue = "N") String targetStatus) {
|
||||||
|
|
||||||
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo);
|
||||||
log.debug("reqVO: {}", reqVO);
|
log.debug("reqVO: {}, target: {}, status: {}", reqVO, targetType, targetStatus);
|
||||||
log.debug("target: {}", targetType);
|
|
||||||
log.debug("status: {}", targetStatus);
|
|
||||||
|
|
||||||
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO);
|
DailyRecordDto detail = dailyRecordPortIn.detail(reqVO);
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class DailyRecordUIController {
|
|||||||
private final CreateDailyRecordValidator createDailyRecordValidator;
|
private final CreateDailyRecordValidator createDailyRecordValidator;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 일계부 등록 화면
|
* 일계부 항목 등록 화면
|
||||||
*
|
*
|
||||||
* @param model Model
|
* @param model Model
|
||||||
* @param searchMonth 검색 월(yyyyMM)
|
* @param searchMonth 검색 월(yyyyMM)
|
||||||
@@ -44,11 +44,11 @@ public class DailyRecordUIController {
|
|||||||
model.addAttribute("reqVO", reqVO);
|
model.addAttribute("reqVO", reqVO);
|
||||||
model.addAttribute("dailyRecord", dailyRecord);
|
model.addAttribute("dailyRecord", dailyRecord);
|
||||||
|
|
||||||
return "record/daily";
|
return "record/daily/index";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 일계부 등록 완료(종료) 화면
|
* 일계부 완료(종료) 화면
|
||||||
*
|
*
|
||||||
* @param model Model
|
* @param model Model
|
||||||
* @param searchMonth 검색 월(yyyyMM)
|
* @param searchMonth 검색 월(yyyyMM)
|
||||||
@@ -76,6 +76,4 @@ public class DailyRecordUIController {
|
|||||||
|
|
||||||
return modelAndView;
|
return modelAndView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,40 +28,22 @@ krip.daily.goToPrev = function() {
|
|||||||
* @param groupNo
|
* @param groupNo
|
||||||
*/
|
*/
|
||||||
krip.daily.goToNext = function(target, searchMonth, 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;
|
let url = krip.daily.httpUrl.target;
|
||||||
url = url.replace('{month}', searchMonth);
|
url = url.replace('{month}', searchMonth);
|
||||||
url = url.replace('{groupNo}', groupNo);
|
url = url.replace('{groupNo}', groupNo);
|
||||||
url = url.replace('{target}', target.toLowerCase());
|
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;
|
location.href = url;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -114,7 +114,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section layout:fragment="script">
|
<section layout:fragment="script">
|
||||||
<script th:src="@{/static/ui/page/daily-record.js}"></script>
|
<script th:src="@{/ui/page/daily-record.js}"></script>
|
||||||
<script th:inline="javascript">
|
<script th:inline="javascript">
|
||||||
let ENV = {
|
let ENV = {
|
||||||
httpUrl: {
|
httpUrl: {
|
||||||
Reference in New Issue
Block a user