[FO] 일계부 유효성 일괄 체크
This commit is contained in:
@@ -118,6 +118,13 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
|
|||||||
return refineList;
|
return refineList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command) {
|
||||||
|
int dataNoneCount = recordCalendarMapper.getDataNoneCountBySomeDayAfter(command);
|
||||||
|
|
||||||
|
return dataNoneCount != 0;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 특정월의 일 그룹 조회
|
* 특정월의 일 그룹 조회
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -33,4 +33,12 @@ public interface RecordCalendarMapper {
|
|||||||
* @return 월별 작성 상태
|
* @return 월별 작성 상태
|
||||||
*/
|
*/
|
||||||
MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command);
|
MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 3일전 ~ 15일전 미등록된 데이터 개수 조회
|
||||||
|
*
|
||||||
|
* @param command 검색 조건
|
||||||
|
* @return 미등록 건 수
|
||||||
|
*/
|
||||||
|
Integer getDataNoneCountBySomeDayAfter(RecordCalendarCmd command);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package app.module.front.usecase.daily.calendar.adapters.web;
|
package app.module.front.usecase.daily.calendar.adapters.web;
|
||||||
|
|
||||||
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
|
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
|
||||||
|
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@RequestMapping(path = "/record/calendar")
|
@RequestMapping(path = "/record/calendar")
|
||||||
public class RecordCalendarUIController {
|
public class RecordCalendarUIController {
|
||||||
|
private final RecordCalendarPortIn recordCalendarPortIn;
|
||||||
|
|
||||||
@GetMapping(path = "")
|
@GetMapping(path = "")
|
||||||
public String index(Model model) {
|
public String index(Model model) {
|
||||||
@@ -21,7 +23,7 @@ public class RecordCalendarUIController {
|
|||||||
|
|
||||||
model.addAttribute("reqVO", reqVO);
|
model.addAttribute("reqVO", reqVO);
|
||||||
|
|
||||||
// TODO : 현재 날짜로부터 3일 이전 날짜에 등록하지 않은 날이 있을 경우
|
model.addAttribute("dataNone", recordCalendarPortIn.getDataNoneCountBySomeDayAfter(reqVO));
|
||||||
|
|
||||||
return "record/calendar";
|
return "record/calendar";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ package app.module.front.usecase.daily.calendar.adapters.web.model;
|
|||||||
|
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
import lombok.ToString;
|
import lombok.ToString;
|
||||||
import org.apache.tika.utils.StringUtils;
|
import org.apache.tika.utils.StringUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
@@ -10,7 +12,8 @@ import org.slf4j.LoggerFactory;
|
|||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
|
||||||
@Data
|
@Getter
|
||||||
|
@Setter
|
||||||
@ToString
|
@ToString
|
||||||
public class RecordCalendarUIReqVO extends DailyUIReqVO {
|
public class RecordCalendarUIReqVO extends DailyUIReqVO {
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class);
|
private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.calendar.ports;
|
package app.module.front.usecase.daily.calendar.ports;
|
||||||
|
|
||||||
|
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd;
|
||||||
|
|
||||||
@@ -7,4 +8,6 @@ import java.util.List;
|
|||||||
|
|
||||||
public interface RecordCalendarPortIn {
|
public interface RecordCalendarPortIn {
|
||||||
List<RecordCalendar> operate(RecordCalendarCmd command);
|
List<RecordCalendar> operate(RecordCalendarCmd command);
|
||||||
|
|
||||||
|
boolean getDataNoneCountBySomeDayAfter(RecordCalendarUIReqVO reqVO);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,4 +9,6 @@ import java.util.List;
|
|||||||
|
|
||||||
public interface RecordCalendarPortOut {
|
public interface RecordCalendarPortOut {
|
||||||
List<RecordCalendar> operate(RecordCalendarCmd command);
|
List<RecordCalendar> operate(RecordCalendarCmd command);
|
||||||
|
|
||||||
|
boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package app.module.front.usecase.daily.calendar.ports.application;
|
package app.module.front.usecase.daily.calendar.ports.application;
|
||||||
|
|
||||||
|
import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO;
|
||||||
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
|
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn;
|
||||||
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
|
import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut;
|
||||||
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar;
|
||||||
@@ -18,4 +19,9 @@ public class RecordCalendarService implements RecordCalendarPortIn {
|
|||||||
public List<RecordCalendar> operate(RecordCalendarCmd command) {
|
public List<RecordCalendar> operate(RecordCalendarCmd command) {
|
||||||
return portOut.operate(command);
|
return portOut.operate(command);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean getDataNoneCountBySomeDayAfter(RecordCalendarUIReqVO reqVO) {
|
||||||
|
return portOut.getDataNoneCountBySomeDayAfter(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq(), 0));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ public class DailyExpenseUIController {
|
|||||||
model.addAttribute("dailyRecord", dailyRecord);
|
model.addAttribute("dailyRecord", dailyRecord);
|
||||||
model.addAttribute("expenseList", expenseList);
|
model.addAttribute("expenseList", expenseList);
|
||||||
model.addAttribute("moveStep", !"update".equals(searchType));
|
model.addAttribute("moveStep", !"update".equals(searchType));
|
||||||
model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.EXPENSE));
|
|
||||||
|
|
||||||
return "record/expense/index";
|
return "record/expense/index";
|
||||||
}
|
}
|
||||||
@@ -110,6 +109,8 @@ public class DailyExpenseUIController {
|
|||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dailyRecord.setCurrentStep(DailySort.EXPENSE);
|
||||||
|
|
||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ public class DailyFarmingUIController {
|
|||||||
model.addAttribute("dailyRecord", dailyRecord);
|
model.addAttribute("dailyRecord", dailyRecord);
|
||||||
model.addAttribute("farmingList", farmingList);
|
model.addAttribute("farmingList", farmingList);
|
||||||
model.addAttribute("moveStep", !"update".equals(searchType));
|
model.addAttribute("moveStep", !"update".equals(searchType));
|
||||||
model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.FARMING));
|
|
||||||
|
|
||||||
return "record/farming/index";
|
return "record/farming/index";
|
||||||
}
|
}
|
||||||
@@ -110,6 +109,8 @@ public class DailyFarmingUIController {
|
|||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dailyRecord.setCurrentStep(DailySort.FARMING);
|
||||||
|
|
||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ public class DailyForestryUIController {
|
|||||||
model.addAttribute("dailyRecord", dailyRecord);
|
model.addAttribute("dailyRecord", dailyRecord);
|
||||||
model.addAttribute("forestryList", forestryList);
|
model.addAttribute("forestryList", forestryList);
|
||||||
model.addAttribute("moveStep", !"update".equals(searchType));
|
model.addAttribute("moveStep", !"update".equals(searchType));
|
||||||
model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.FORESTRY));
|
|
||||||
|
|
||||||
return "record/forestry/index";
|
return "record/forestry/index";
|
||||||
}
|
}
|
||||||
@@ -110,6 +109,8 @@ public class DailyForestryUIController {
|
|||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dailyRecord.setCurrentStep(DailySort.FORESTRY);
|
||||||
|
|
||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ public class DailyIncomeUIController {
|
|||||||
model.addAttribute("dailyRecord", dailyRecord);
|
model.addAttribute("dailyRecord", dailyRecord);
|
||||||
model.addAttribute("incomeList", incomeList);
|
model.addAttribute("incomeList", incomeList);
|
||||||
model.addAttribute("moveStep", !"update".equals(searchType));
|
model.addAttribute("moveStep", !"update".equals(searchType));
|
||||||
model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.INCOME));
|
|
||||||
|
|
||||||
return "record/income/index";
|
return "record/income/index";
|
||||||
}
|
}
|
||||||
@@ -110,6 +109,8 @@ public class DailyIncomeUIController {
|
|||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dailyRecord.setCurrentStep(DailySort.INCOME);
|
||||||
|
|
||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,6 @@ public class DailyPowerUIController {
|
|||||||
model.addAttribute("dailyRecord", dailyRecord);
|
model.addAttribute("dailyRecord", dailyRecord);
|
||||||
model.addAttribute("powerList", powerList);
|
model.addAttribute("powerList", powerList);
|
||||||
model.addAttribute("moveStep", !"update".equals(searchType));
|
model.addAttribute("moveStep", !"update".equals(searchType));
|
||||||
model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.POWER));
|
|
||||||
|
|
||||||
return "record/power/index";
|
return "record/power/index";
|
||||||
}
|
}
|
||||||
@@ -105,6 +104,8 @@ public class DailyPowerUIController {
|
|||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dailyRecord.setCurrentStep(DailySort.POWER);
|
||||||
|
|
||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
@Override
|
@Override
|
||||||
public DailyRecordDto detail(GetDailyRecordCmd command) {
|
public DailyRecordDto detail(GetDailyRecordCmd command) {
|
||||||
DailyRecordDto detail = dailyRecordMapper.getDailyRecord(command);
|
DailyRecordDto detail = dailyRecordMapper.getDailyRecord(command);
|
||||||
if (detail != null && !detail.isUpdated()) {
|
if (detail != null && detail.getStartDate() == null) {
|
||||||
try {
|
try {
|
||||||
SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN);
|
SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN);
|
||||||
SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN);
|
SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN);
|
||||||
@@ -36,6 +36,10 @@ public class DailyRecordDao implements DailyRecordPortOut {
|
|||||||
formatDate = beforeSdf.parse(command.getSearchMonth() + String.format("%02d", detail.getEndDay()));
|
formatDate = beforeSdf.parse(command.getSearchMonth() + String.format("%02d", detail.getEndDay()));
|
||||||
detail.setEndDate(LocalDate.parse(afterSdf.format(formatDate)));
|
detail.setEndDate(LocalDate.parse(afterSdf.format(formatDate)));
|
||||||
|
|
||||||
|
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
|
||||||
|
// 종료일의 달이 변경되면 시작일=종료일 처리
|
||||||
|
detail.setEndDate(detail.getStartDate());
|
||||||
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.warn("[DateParse] target={}", detail.getStartDay(), e);
|
log.warn("[DateParse] target={}", detail.getStartDay(), e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,16 +4,14 @@ import app.module.front.usecase.daily.record.adapters.web.model.DailySort;
|
|||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus;
|
||||||
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
|
import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
@Data
|
@Data
|
||||||
public class DailyRecordDto {
|
public class DailyRecordDto {
|
||||||
// household_seq, record_month, day_group_no, start_date, end_date
|
|
||||||
// , all_status, income_status, work_status, expense_status, power_status, forestry_status
|
|
||||||
// , created_at, created_by, is_deleted
|
|
||||||
|
|
||||||
private String recordMonth;
|
private String recordMonth;
|
||||||
private Integer groupNo;
|
private Integer groupNo;
|
||||||
private Integer startDay;
|
private Integer startDay;
|
||||||
@@ -30,14 +28,63 @@ public class DailyRecordDto {
|
|||||||
private DailyTargetStatus forestryStatus;
|
private DailyTargetStatus forestryStatus;
|
||||||
private DailyTargetStatus farmingStatus;
|
private DailyTargetStatus farmingStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 마지막 일 여부
|
||||||
|
*/
|
||||||
private boolean lastDay;
|
private boolean lastDay;
|
||||||
|
/**
|
||||||
|
* 자가농업 항목 오픈 여부
|
||||||
|
*/
|
||||||
|
private boolean farmingOpen;
|
||||||
|
/**
|
||||||
|
* 특정일의 데이터 등록 대상 항목
|
||||||
|
*/
|
||||||
private List<DailySort> targetList;
|
private List<DailySort> targetList;
|
||||||
|
/**
|
||||||
|
* 현재 단계
|
||||||
|
*/
|
||||||
|
private DailySort currentStep;
|
||||||
|
|
||||||
public boolean isUpdated() {
|
/**
|
||||||
return this.id != null;
|
* 마지막 일 여부
|
||||||
|
* @return true=마지막 일, false=마지막 일 아님
|
||||||
|
*/
|
||||||
|
public boolean isLastDay() {
|
||||||
|
if (endDate != null) {
|
||||||
|
LocalDate lastDate = endDate.withDayOfMonth(endDate.lengthOfMonth());
|
||||||
|
|
||||||
|
return endDate == lastDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getNextStep(DailySort currentStep) {
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 자가농업 항목 오픈 여부
|
||||||
|
* [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날
|
||||||
|
* @return true=대상, false=대상 아님
|
||||||
|
*/
|
||||||
|
public boolean isFarmingOpen() {
|
||||||
|
return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 데이터 수정 가능 여부
|
||||||
|
* [정책] 15일전까지 데이터 수정 가능(등록도 불가)
|
||||||
|
* @return true=수정 가능, false=수정 불가
|
||||||
|
*/
|
||||||
|
public boolean isModifiable() {
|
||||||
|
LocalDate limitStart = LocalDate.now().minusDays(15);
|
||||||
|
|
||||||
|
return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 다음 단계로 이동될 단계 조회
|
||||||
|
*
|
||||||
|
* @return 다음 단계명
|
||||||
|
*/
|
||||||
|
public String getNextStep() {
|
||||||
String returnValue = null;
|
String returnValue = null;
|
||||||
if (targetList != null) {
|
if (targetList != null) {
|
||||||
int index = 0;
|
int index = 0;
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ public class DailyRecordService implements DailyRecordPortIn {
|
|||||||
reqVO.getHouseholdSeq()));
|
reqVO.getHouseholdSeq()));
|
||||||
|
|
||||||
if (dailyRecord != null) {
|
if (dailyRecord != null) {
|
||||||
// TODO : 이전 다음을 체크하기 위함
|
|
||||||
List<DailySort> targetList = new ArrayList<>();
|
List<DailySort> targetList = new ArrayList<>();
|
||||||
if (this.isTarget(dailyRecord.getIncomeStatus())) {
|
if (this.isTarget(dailyRecord.getIncomeStatus())) {
|
||||||
targetList.add(DailySort.INCOME);
|
targetList.add(DailySort.INCOME);
|
||||||
@@ -55,19 +54,15 @@ public class DailyRecordService implements DailyRecordPortIn {
|
|||||||
dailyRecord.setTargetList(targetList);
|
dailyRecord.setTargetList(targetList);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO : 마지막날 건의사항 모달 팝업 뜨는 것
|
|
||||||
LocalDate lastDate = dailyRecord.getEndDate().withDayOfMonth(dailyRecord.getEndDate().lengthOfMonth());
|
|
||||||
log.debug("lastDate: {}", lastDate);
|
|
||||||
|
|
||||||
if (dailyRecord.getEndDate() == lastDate) {
|
|
||||||
dailyRecord.setLastDay(true);
|
|
||||||
} else {
|
|
||||||
dailyRecord.setLastDay(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 데이터 등록 대상 여부
|
||||||
|
*
|
||||||
|
* @param status 상태
|
||||||
|
* @return true=대상, false=대상 아님
|
||||||
|
*/
|
||||||
private boolean isTarget(DailyTargetStatus status) {
|
private boolean isTarget(DailyTargetStatus status) {
|
||||||
return DailyTargetStatus.TARGET.equals(status) || DailyTargetStatus.TODAY_NONE.equals(status);
|
return DailyTargetStatus.TARGET.equals(status) || DailyTargetStatus.TODAY_NONE.equals(status);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class DailyWorkUIController {
|
|||||||
model.addAttribute("reqVO", reqVO);
|
model.addAttribute("reqVO", reqVO);
|
||||||
model.addAttribute("dailyRecord", dailyRecord);
|
model.addAttribute("dailyRecord", dailyRecord);
|
||||||
model.addAttribute("workList", workList);
|
model.addAttribute("workList", workList);
|
||||||
model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.WORK));
|
model.addAttribute("moveStep", !"update".equals(searchType));
|
||||||
|
|
||||||
return "record/work/index";
|
return "record/work/index";
|
||||||
}
|
}
|
||||||
@@ -108,6 +108,8 @@ public class DailyWorkUIController {
|
|||||||
throw new NoRecordDataException();
|
throw new NoRecordDataException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dailyRecord.setCurrentStep(DailySort.WORK);
|
||||||
|
|
||||||
return dailyRecord;
|
return dailyRecord;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,4 +50,68 @@
|
|||||||
limit 1
|
limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getDataNoneCountBySomeDayAfter">
|
||||||
|
<![CDATA[
|
||||||
|
with temp_day_group as (
|
||||||
|
select group_no, start_day, end_day
|
||||||
|
, DATE_PART('day', CURRENT_DATE - INTERVAL '3 days') as current_day
|
||||||
|
, DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') as prev_day
|
||||||
|
, DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days') as prev_last_day
|
||||||
|
, DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') as current_month1
|
||||||
|
, DATE_PART('month', CURRENT_DATE - INTERVAL '15 days') as prev_month
|
||||||
|
, TO_CHAR(CURRENT_DATE, 'YYYYMM') as current_month
|
||||||
|
from daily_day_group
|
||||||
|
where DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') = DATE_PART('month', CURRENT_DATE - INTERVAL '15 days')
|
||||||
|
and (
|
||||||
|
(
|
||||||
|
start_day >= DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') and end_day <= DATE_PART('day', CURRENT_DATE - INTERVAL '3 days'))
|
||||||
|
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
|
||||||
|
or end_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
|
||||||
|
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '15 days')
|
||||||
|
or end_day = DATE_PART('day', CURRENT_DATE - INTERVAL '15 days')
|
||||||
|
)
|
||||||
|
union all
|
||||||
|
select group_no, start_day, end_day
|
||||||
|
, DATE_PART('day', CURRENT_DATE - INTERVAL '3 days') as current_day
|
||||||
|
, DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') as prev_day
|
||||||
|
, DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days') as prev_last_day
|
||||||
|
, DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') as current_month1
|
||||||
|
, DATE_PART('month', CURRENT_DATE - INTERVAL '15 days') as prev_month
|
||||||
|
, (case when start_day <= 16 then
|
||||||
|
TO_CHAR(CURRENT_DATE, 'YYYYMM')
|
||||||
|
else
|
||||||
|
TO_CHAR(CURRENT_DATE - INTERVAL '15 days', 'YYYYMM')
|
||||||
|
end
|
||||||
|
) as current_month
|
||||||
|
from daily_day_group
|
||||||
|
where DATE_PART('month', CURRENT_DATE - INTERVAL '3 days') != DATE_PART('month', CURRENT_DATE - INTERVAL '15 days')
|
||||||
|
and (
|
||||||
|
-- 현재월 DAY 조회
|
||||||
|
start_day >= 1 and end_day <= DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
|
||||||
|
or start_day >= DATE_PART('day', CURRENT_DATE - INTERVAL '15 days') and end_day <= DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
|
||||||
|
|
||||||
|
-- 3일전 DAY 로 시작, 종료일이 같은지 여부
|
||||||
|
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
|
||||||
|
or end_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
|
||||||
|
|
||||||
|
-- 이전월 마지막 DAY 로 시작, 종료일이 같은지 여부
|
||||||
|
or start_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
|
||||||
|
or end_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days')
|
||||||
|
|
||||||
|
/*
|
||||||
|
-- 현재 DAY 로 시작, 종료일이 같은지 여부
|
||||||
|
or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days')
|
||||||
|
*/
|
||||||
|
)
|
||||||
|
)
|
||||||
|
--select count(tdg.group_no), count(dr.id)
|
||||||
|
select case when count(tdg.group_no) = count(dr.id) then 0 else count(tdg.group_no) - count(dr.id) end
|
||||||
|
--select *
|
||||||
|
from temp_day_group tdg
|
||||||
|
left join
|
||||||
|
daily_record dr on dr.record_month = tdg.current_month and dr.day_group_no = tdg.group_no
|
||||||
|
and dr.household_seq = #{householdSeq}
|
||||||
|
]]>
|
||||||
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
@@ -4,20 +4,21 @@
|
|||||||
|
|
||||||
<div layout:fragment="content" th:classappend="acco-wrap">
|
<div layout:fragment="content" th:classappend="acco-wrap">
|
||||||
<main id="content" role="main">
|
<main id="content" role="main">
|
||||||
<!-- alert-box 클래스 리스트트
|
<!--/* alert-box 클래스 리스트트
|
||||||
fail : 실패(빨강)
|
fail : 실패(빨강)
|
||||||
warning : 경고(노랑)
|
warning : 경고(노랑)
|
||||||
success : 성공(초록)
|
success : 성공(초록)
|
||||||
info : 인포(파랑)
|
info : 인포(파랑)
|
||||||
-->
|
*/-->
|
||||||
<!-- TODO -->
|
<article class="alert-box warning"
|
||||||
<!--<article class="alert-box warning">
|
th:if="${dataNone}">
|
||||||
<p class="tit"><strong>홍길동</strong>님,</p>
|
<p class="tit"
|
||||||
|
sec:authorize="isAuthenticated()"><strong th:text="${#authentication.principal.ownerName}">홍길동</strong>님,</p>
|
||||||
<span class="txt">
|
<span class="txt">
|
||||||
일계부를 등록하지 않은 날짜가 있습니다. <br>
|
일계부를 등록하지 않은 날짜가 있습니다. <br>
|
||||||
정확한 조사를 위해 꾸준히 입력해 주세요.
|
정확한 조사를 위해 꾸준히 입력해 주세요.
|
||||||
</span>
|
</span>
|
||||||
</article>-->
|
</article>
|
||||||
|
|
||||||
<!-- 캘린더 -->
|
<!-- 캘린더 -->
|
||||||
<section class="main-calendar">
|
<section class="main-calendar">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<!--/* [정책] 매달 30~31일 현황 등록 시에 마지막 완료 단계 직전에 노출 */-->
|
<!--/* [정책] 매달 30~31일 현황 등록시 마지막 완료 단계 직전에 노출 */-->
|
||||||
<div class="layer-wrap">
|
<div class="layer-wrap">
|
||||||
<div class="component-modal acco-wrap commentModal" data-props-dimm-click="true">
|
<div class="component-modal acco-wrap commentModal" data-props-dimm-click="true">
|
||||||
<div class="modal-dimm"></div>
|
<div class="modal-dimm"></div>
|
||||||
|
|||||||
@@ -98,7 +98,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<div class="component-btns fixed">
|
<div class="component-btns fixed"
|
||||||
|
th:if="${dailyRecord.modifiable}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" class="btn btn-l btn-primary _nextStep"
|
<button type="button" class="btn btn-l btn-primary _nextStep"
|
||||||
th:data-last="${dailyRecord.lastDay}"
|
th:data-last="${dailyRecord.lastDay}"
|
||||||
|
|||||||
@@ -16,22 +16,26 @@
|
|||||||
<strong>지출 내역 [[${#lists.isEmpty(expenseList) ? 0 : #lists.size(expenseList)}]]건 등록</strong> <br>
|
<strong>지출 내역 [[${#lists.isEmpty(expenseList) ? 0 : #lists.size(expenseList)}]]건 등록</strong> <br>
|
||||||
되었습니다.
|
되었습니다.
|
||||||
</h3>
|
</h3>
|
||||||
<p>지출 내역을 등록해 주세요.</p>
|
<p th:if="${#lists.isEmpty(expenseList)}">지출 내역을 등록해 주세요..</p>
|
||||||
|
<p th:unless="${#lists.isEmpty(expenseList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
||||||
</hgroup>
|
</hgroup>
|
||||||
|
|
||||||
<!--/* 신규 등록 */-->
|
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||||
<th:block th:if="${#lists.isEmpty(expenseList)}">
|
<th:block th:if="${#lists.isEmpty(expenseList)}">
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
th:disabled="${#strings.equals(dailyRecord.expenseStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<i class=" ico-small" aria-hidden="true"
|
<i class=" ico-small" aria-hidden="true"
|
||||||
th:classappend="${#strings.equals(dailyRecord.expenseStatus, 'TODAY_NONE') ? 'ico-add-disabled' : 'ico-add'}"></i>
|
th:classappend="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="component-input align-center">
|
<div class="component-input align-center">
|
||||||
<label class="checkbox-inner" id="todayNone">
|
<label class="checkbox-inner" id="todayNone">
|
||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="EXPENSE"
|
data-type="EXPENSE"
|
||||||
th:checked="${#strings.equals(dailyRecord.expenseStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable}"
|
||||||
|
th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -91,16 +95,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<!-- 하단 고정 버튼 -->
|
<!--/* 하단 고정 버튼 */-->
|
||||||
<div class="component-btns fixed"
|
<div class="component-btns fixed"
|
||||||
th:if="${moveStep}">
|
th:if="${dailyRecord.modifiable && moveStep}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
||||||
<span class="btn-txt">이전 단계로 이동</span>
|
<span class="btn-txt">이전 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary"
|
<button type="button" class="btn btn-l btn-primary"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, 'TODAY_NONE') and #lists.isEmpty(expenseList)}"
|
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(expenseList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -20,19 +20,22 @@
|
|||||||
<p th:unless="${#lists.isEmpty(farmingList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
<p th:unless="${#lists.isEmpty(farmingList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
||||||
</hgroup>
|
</hgroup>
|
||||||
|
|
||||||
<!--/* 신규 등록 */-->
|
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||||
<th:block th:if="${#lists.isEmpty(farmingList)}">
|
<th:block th:if="${#lists.isEmpty(farmingList)}">
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
th:disabled="${#strings.equals(dailyRecord.farmingStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<i class="ico-small" aria-hidden="true"
|
<i class="ico-small" aria-hidden="true"
|
||||||
th:classappend="${#strings.equals(dailyRecord.farmingStatus, 'TODAY_NONE') ? 'ico-add-disabled' : 'ico-add'}"></i>
|
th:classappend="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="component-input align-center">
|
<div class="component-input align-center">
|
||||||
<label class="checkbox-inner" id="todayNone">
|
<label class="checkbox-inner" id="todayNone">
|
||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="FARMING"
|
data-type="FARMING"
|
||||||
th:checked="${#strings.equals(dailyRecord.farmingStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable}"
|
||||||
|
th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -95,16 +98,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<!-- 하단 고정 버튼 -->
|
<!--/* 하단 고정 버튼 */-->
|
||||||
<div class="component-btns fixed"
|
<div class="component-btns fixed"
|
||||||
th:if="${moveStep}">
|
th:if="${dailyRecord.modifiable && moveStep}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
||||||
<span class="btn-txt">이전 단계로 이동</span>
|
<span class="btn-txt">이전 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary"
|
<button type="button" class="btn btn-l btn-primary"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.farmingStatus, 'TODAY_NONE') and #lists.isEmpty(farmingList)}"
|
th:disabled="${not #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(farmingList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -20,19 +20,22 @@
|
|||||||
<p th:unless="${#lists.isEmpty(forestryList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
<p th:unless="${#lists.isEmpty(forestryList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
||||||
</hgroup>
|
</hgroup>
|
||||||
|
|
||||||
<!--/* 신규 등록 */-->
|
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||||
<th:block th:if="${#lists.isEmpty(forestryList)}">
|
<th:block th:if="${#lists.isEmpty(forestryList)}">
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
th:disabled="${#strings.equals(dailyRecord.forestryStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<i class="ico-small" aria-hidden="true"
|
<i class="ico-small" aria-hidden="true"
|
||||||
th:classappend="${#strings.equals(dailyRecord.forestryStatus, 'TODAY_NONE') ? 'ico-add-disabled' : 'ico-add'}"></i>
|
th:classappend="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="component-input align-center">
|
<div class="component-input align-center">
|
||||||
<label class="checkbox-inner" id="todayNone">
|
<label class="checkbox-inner" id="todayNone">
|
||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="FORESTRY"
|
data-type="FORESTRY"
|
||||||
th:checked="${#strings.equals(dailyRecord.forestryStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable}"
|
||||||
|
th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -95,16 +98,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<!-- 하단 고정 버튼 -->
|
<!--/* 하단 고정 버튼 */-->
|
||||||
<div class="component-btns fixed"
|
<div class="component-btns fixed"
|
||||||
th:if="${moveStep}">
|
th:if="${dailyRecord.modifiable && moveStep}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
||||||
<span class="btn-txt">이전 단계로 이동</span>
|
<span class="btn-txt">이전 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary"
|
<button type="button" class="btn btn-l btn-primary"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.forestryStatus, 'TODAY_NONE') and #lists.isEmpty(forestryList)}"
|
th:disabled="${not #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(forestryList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -16,22 +16,27 @@
|
|||||||
<strong>수입 내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록</strong> <br>
|
<strong>수입 내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록</strong> <br>
|
||||||
되었습니다.
|
되었습니다.
|
||||||
</h3>
|
</h3>
|
||||||
<p>수입 내역을 등록해 주세요.</p>
|
<p></p>
|
||||||
|
<p th:if="${#lists.isEmpty(incomeList)}">수입 내역을 등록해 주세요.</p>
|
||||||
|
<p th:unless="${#lists.isEmpty(incomeList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
||||||
</hgroup>
|
</hgroup>
|
||||||
|
|
||||||
<!--/* 신규 등록 */-->
|
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||||
<th:block th:if="${#lists.isEmpty(incomeList)}">
|
<th:block th:if="${#lists.isEmpty(incomeList)}">
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
th:disabled="${#strings.equals(dailyRecord.incomeStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<i class=" ico-small" aria-hidden="true"
|
<i class=" ico-small" aria-hidden="true"
|
||||||
th:classappend="${#strings.equals(dailyRecord.incomeStatus, 'TODAY_NONE') ? 'ico-add-disabled' : 'ico-add'}"></i>
|
th:classappend="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="component-input align-center">
|
<div class="component-input align-center">
|
||||||
<label class="checkbox-inner" id="todayNone">
|
<label class="checkbox-inner" id="todayNone">
|
||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="INCOME"
|
data-type="INCOME"
|
||||||
th:checked="${#strings.equals(dailyRecord.incomeStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable}"
|
||||||
|
th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -95,16 +100,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<!-- 하단 고정 버튼 -->
|
<!--/* 하단 고정 버튼 */-->
|
||||||
<div class="component-btns fixed"
|
<div class="component-btns fixed"
|
||||||
th:if="${moveStep}">
|
th:if="${dailyRecord.modifiable && moveStep}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
||||||
<span class="btn-txt">이전 단계로 이동</span>
|
<span class="btn-txt">이전 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary"
|
<button type="button" class="btn btn-l btn-primary"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, 'TODAY_NONE') and #lists.isEmpty(incomeList)}"
|
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(incomeList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -16,22 +16,26 @@
|
|||||||
<strong>동력 사용내역 [[${#lists.isEmpty(powerList) ? 0 : #lists.size(powerList)}]]건 등록</strong> <br>
|
<strong>동력 사용내역 [[${#lists.isEmpty(powerList) ? 0 : #lists.size(powerList)}]]건 등록</strong> <br>
|
||||||
되었습니다.
|
되었습니다.
|
||||||
</h3>
|
</h3>
|
||||||
<p>동력 사용내역을 등록해 주세요.</p>
|
<p th:if="${#lists.isEmpty(powerList)}">동력 사용내역을 등록해 주세요.</p>
|
||||||
|
<p th:unless="${#lists.isEmpty(powerList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
||||||
</hgroup>
|
</hgroup>
|
||||||
|
|
||||||
<!--/* 신규 등록 */-->
|
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||||
<th:block th:if="${#lists.isEmpty(powerList)}">
|
<th:block th:if="${#lists.isEmpty(powerList)}">
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
th:disabled="${#strings.equals(dailyRecord.powerStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<i class="ico-small" aria-hidden="true"
|
<i class="ico-small" aria-hidden="true"
|
||||||
th:classappend="${#strings.equals(dailyRecord.powerStatus, 'TODAY_NONE') ? 'ico-add-disabled' : 'ico-add'}"></i>
|
th:classappend="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="component-input align-center">
|
<div class="component-input align-center">
|
||||||
<label class="checkbox-inner" id="todayNone">
|
<label class="checkbox-inner" id="todayNone">
|
||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="POWER"
|
data-type="POWER"
|
||||||
th:checked="${#strings.equals(dailyRecord.powerStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable}"
|
||||||
|
th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -79,16 +83,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<!-- 하단 고정 버튼 -->
|
<!--/* 하단 고정 버튼 */-->
|
||||||
<div class="component-btns fixed"
|
<div class="component-btns fixed"
|
||||||
th:if="${moveStep}">
|
th:if="${dailyRecord.modifiable && moveStep}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
||||||
<span class="btn-txt">이전 단계로 이동</span>
|
<span class="btn-txt">이전 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary"
|
<button type="button" class="btn btn-l btn-primary"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.powerStatus, 'TODAY_NONE') and #lists.isEmpty(powerList)}"
|
th:disabled="${not #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(powerList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -16,22 +16,26 @@
|
|||||||
<strong>임업노동 투입 내역 [[${#lists.isEmpty(workList) ? 0 : #lists.size(workList)}]]건 등록</strong> <br>
|
<strong>임업노동 투입 내역 [[${#lists.isEmpty(workList) ? 0 : #lists.size(workList)}]]건 등록</strong> <br>
|
||||||
되었습니다.
|
되었습니다.
|
||||||
</h3>
|
</h3>
|
||||||
<p>임업노동 투입 내역을 등록해 주세요.</p>
|
<p th:if="${#lists.isEmpty(workList)}">임업노동 투입 내역을 등록해 주세요.</p>
|
||||||
|
<p th:unless="${#lists.isEmpty(workList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
|
||||||
</hgroup>
|
</hgroup>
|
||||||
|
|
||||||
<!--/* 신규 등록 */-->
|
<!--/* 신규 등록 : dailyRecord.modifiable=false 수정 기간 아님 */-->
|
||||||
<th:block th:if="${#lists.isEmpty(workList)}">
|
<th:block th:if="${#lists.isEmpty(workList)}">
|
||||||
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
|
||||||
th:disabled="${#strings.equals(dailyRecord.workStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<i class="ico-small" aria-hidden="true"
|
<i class="ico-small" aria-hidden="true"
|
||||||
th:classappend="${#strings.equals(dailyRecord.workStatus, 'TODAY_NONE') ? 'ico-add-disabled' : 'ico-add'}"></i>
|
th:classappend="${not dailyRecord.modifiable
|
||||||
|
|| #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) ? 'ico-add-disabled' : 'ico-add'}"></i>
|
||||||
<span class="btn-txt">추가 등록</span>
|
<span class="btn-txt">추가 등록</span>
|
||||||
</button>
|
</button>
|
||||||
<div class="component-input align-center">
|
<div class="component-input align-center">
|
||||||
<label class="checkbox-inner" id="todayNone">
|
<label class="checkbox-inner" id="todayNone">
|
||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="WORK"
|
data-type="WORK"
|
||||||
th:checked="${#strings.equals(dailyRecord.workStatus, 'TODAY_NONE')}">
|
th:disabled="${not dailyRecord.modifiable}"
|
||||||
|
th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -140,16 +144,16 @@
|
|||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<!-- 하단 고정 버튼 -->
|
<!--/* 하단 고정 버튼 */-->
|
||||||
<div class="component-btns fixed"
|
<div class="component-btns fixed"
|
||||||
th:if="${moveStep}">
|
th:if="${dailyRecord.modifiable && moveStep}">
|
||||||
<div class="btns-row">
|
<div class="btns-row">
|
||||||
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
<button type="button" class="btn btn-l btn-secondary" onclick="krip.daily.goToPrev();">
|
||||||
<span class="btn-txt">이전 단계로 이동</span>
|
<span class="btn-txt">이전 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-l btn-primary"
|
<button type="button" class="btn btn-l btn-primary"
|
||||||
th:disabled="${not #strings.equals(dailyRecord.workStatus, 'TODAY_NONE') and #lists.isEmpty(workList)}"
|
th:disabled="${not #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(workList)}"
|
||||||
th:onclick="krip.daily.goToNext([[${nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]])">
|
||||||
<span class="btn-txt">다음 단계로 이동</span>
|
<span class="btn-txt">다음 단계로 이동</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user