From 96626c6cb7a97fa619c5f13f44cb1957f22491ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?=
Date: Mon, 9 Jun 2025 18:31:07 +0900
Subject: [PATCH 1/8] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?=
=?UTF-8?q?=EB=93=B1=EB=A1=9D=20wip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/sql/schema/02_create-record.sql | 18 +-
.../persistence/RecordCalendarMapper.java | 44 ++++
.../model/DailyRecordCalendarDto.java | 14 ++
.../model/DailyRecordStatusDto.java | 29 +++
.../service/RecordCalendarService.java | 16 ++
.../service/RecordCalendarServiceImpl.java | 54 ++++
.../web/RecordCalendarController.java | 66 +++++
.../web/model/RecordCalendarUIReqVO.java | 73 ++++++
.../income/web/DailyIncomeController.java | 41 +++
.../income/web/model/DailyIncomeUIReqVO.java | 12 +
.../record/persistence/DailyRecordMapper.java | 37 +++
.../persistence/model/DailyRecordDto.java | 33 +++
.../model/UpdateDailyRecordDto.java | 14 ++
.../record/service/DailyRecordService.java | 11 +
.../service/DailyRecordServiceImpl.java | 72 ++++++
.../record/web/DailyRecordController.java | 87 +++++++
.../web/model/CreateDailyRecordReqVO.java | 29 +++
.../record/web/model/DailyRecordUIReqVO.java | 12 +
.../daily/record/web/model/DailyStatus.java | 5 +
.../record/web/model/DailyTargetStatus.java | 5 +
.../web/model/UpdateDailyRecordStatusCmd.java | 20 ++
.../validator/CreateDailyRecordValidator.java | 50 ++++
.../mappers/daily/DailyRecordMapper.xml | 73 ++++++
.../mappers/daily/RecordCalendarMapper.xml | 61 +++++
.../static/library/jquery/jquery-3.7.1.min.js | 2 +
.../src/main/resources/static/ui/ajaxUtil.js | 238 ++++++++++++++++++
.../main/resources/static/ui/commonUtil.js | 33 +++
.../resources/static/ui/page/daily-record.js | 30 +++
.../templates/common/components.html | 4 +-
.../resources/templates/layout/layout.html | 2 +
.../templates/record/calendar-wrap.html | 33 +++
.../resources/templates/record/calendar.html | 74 ++++++
.../resources/templates/record/daily.html | 94 +++++++
.../templates/record/income/index.html | 35 +++
34 files changed, 1412 insertions(+), 9 deletions(-)
create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java
create mode 100644 front/src/main/resources/mappers/daily/DailyRecordMapper.xml
create mode 100644 front/src/main/resources/mappers/daily/RecordCalendarMapper.xml
create mode 100644 front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js
create mode 100644 front/src/main/resources/static/ui/ajaxUtil.js
create mode 100644 front/src/main/resources/static/ui/commonUtil.js
create mode 100644 front/src/main/resources/static/ui/page/daily-record.js
create mode 100644 front/src/main/resources/templates/record/calendar-wrap.html
create mode 100644 front/src/main/resources/templates/record/calendar.html
create mode 100644 front/src/main/resources/templates/record/daily.html
create mode 100644 front/src/main/resources/templates/record/income/index.html
diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql
index 5107a24a..2500e6f9 100644
--- a/core/src/main/resources/sql/schema/02_create-record.sql
+++ b/core/src/main/resources/sql/schema/02_create-record.sql
@@ -2,7 +2,7 @@
-- ============================================
-- 임가 일계부 입력 관련 테이블 S
-- ============================================
-
+/*
DROP TABLE IF EXISTS daily_income;
DROP TABLE IF EXISTS daily_expense;
DROP TABLE IF EXISTS daily_work;
@@ -19,6 +19,8 @@ DROP SEQUENCE IF EXISTS daily_power_seq;
DROP SEQUENCE IF EXISTS daily_forestry_seq;
DROP SEQUENCE IF EXISTS daily_farming_seq;
DROP SEQUENCE IF EXISTS daily_record_seq;
+DROP SEQUENCE IF EXISTS daily_day_group_pkey;
+*/
-- ============================================
@@ -84,7 +86,7 @@ CREATE SEQUENCE daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_record (
id bigint DEFAULT nextval('daily_record_seq') NOT NULL, -- 일계부 작성상태 ID
household_seq bigint NOT NULL, -- 임가 일련번호 (FK)
- month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
+ record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm)
day_group_no smallint, -- 일계부 작성일자 그룹 번호
start_date date, -- 작성시작일(yyyy-mm-dd)
end_date date, -- 작성종료일(yyyy-mm-dd)
@@ -111,7 +113,7 @@ COMMENT ON TABLE daily_record IS '일계부 일별 작성상태';
COMMENT ON COLUMN daily_record.id IS '일계부 작성상태 ID';
COMMENT ON COLUMN daily_record.household_seq IS '임가 일련번호';
-COMMENT ON COLUMN daily_record.month IS '조사시행 월 (yyyy-mm)';
+COMMENT ON COLUMN daily_record.record_month IS '조사시행 월 (yyyy-mm)';
COMMENT ON COLUMN daily_record.start_date IS '작성시작일(yyyy-mm-dd)';
COMMENT ON COLUMN daily_record.end_date IS '작성종료일(yyyy-mm-dd)';
COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호';
@@ -142,13 +144,13 @@ CREATE TABLE daily_income (
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
is_credit boolean, -- 외상판매 여부
crop_code varchar(255), -- 재배형태 코드 (매핑코드)
- category_code varchar(255) NOT NULL, -- 수입 종류(매핑코드)
- category_name varchar(30) NOT NULL, -- 수입 종류(직접입력)
+ category_code varchar(255) NULL, -- 수입 종류(매핑코드)
+ category_name varchar(30) NULL, -- 수입 종류(직접입력)
source_purpose varchar(10), -- 수입원(용도)
quantity decimal(6,2) NOT NULL, -- 수량
- unit_code varchar(10) NOT NULL, -- 단위 (매핑코드)
- price integer NOT NULL, -- 현금(원)
- estimated_value integer NOT NULL, -- 현물(평가액)
+ unit_code varchar(255) NOT NULL, -- 단위 (매핑코드)
+ price integer NULL, -- 현금(원)
+ estimated_value integer NULL, -- 현물(평가액)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java
new file mode 100644
index 00000000..695728ca
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java
@@ -0,0 +1,44 @@
+package app.module.front.usecase.daily.calendar.persistence;
+
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto;
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto;
+import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO;
+import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
+import app.module.front.usecase.daily.record.web.model.UpdateDailyRecordStatusCmd;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface RecordCalendarMapper {
+
+ List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO);
+
+ DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO);
+
+ int getStartDayByDailyGroupNo(@Param("groupNo") Integer groupNo);
+
+ /**
+ * 일계부 등록 여부
+ * @param householdSeq
+ * @param recordMonth
+ * @param dayGroupNo
+ * @return
+ */
+ Long getDailyRecordExistCount(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
+
+ /**
+ * 일계부 등록(생성)
+ * @param command
+ * @return
+ */
+ Long createDailyRecord(CreateDailyRecordReqVO command);
+
+ /**
+ * 일계부 상태 수정
+ * @param command
+ * @return
+ */
+ int updateDailyRecordStatus(UpdateDailyRecordStatusCmd command);
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java
new file mode 100644
index 00000000..bfdd0b1f
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java
@@ -0,0 +1,14 @@
+package app.module.front.usecase.daily.calendar.persistence.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DailyRecordCalendarDto {
+ private String groupNo;
+ private Integer startDay;
+ private Integer endDay;
+ private String startDate;
+ private String dailyId;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java
new file mode 100644
index 00000000..fc13c0b2
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java
@@ -0,0 +1,29 @@
+package app.module.front.usecase.daily.calendar.persistence.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+import java.time.LocalDate;
+
+@Data
+@ToString
+public class DailyRecordStatusDto {
+ /**
+ * 일계부 일련번호
+ */
+ private Long dailyId;
+ private LocalDate startDate;
+ private LocalDate endDate;
+ /**
+ * 특정일 입력 상태 TODO enum
+ */
+ private String allStatus;
+ /**
+ * 수입 입력 상태 TODO enum
+ */
+ private String incomeStatus;
+ /**
+ * 수입 입력 개수
+ */
+ private Integer incomeCount;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java
new file mode 100644
index 00000000..0d528374
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java
@@ -0,0 +1,16 @@
+package app.module.front.usecase.daily.calendar.service;
+
+
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto;
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto;
+import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO;
+
+import java.util.List;
+
+public interface RecordCalendarService {
+ List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO);
+
+ DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO);
+
+ int getStartDayByDailyGroupNo(RecordCalendarUIReqVO reqVO);
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java
new file mode 100644
index 00000000..22cb9bbb
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java
@@ -0,0 +1,54 @@
+package app.module.front.usecase.daily.calendar.service;
+
+import app.module.front.usecase.daily.calendar.persistence.RecordCalendarMapper;
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto;
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto;
+import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO;
+import app.module.front.usecase.daily.record.persistence.DailyRecordMapper;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+@Service
+@RequiredArgsConstructor
+public class RecordCalendarServiceImpl implements RecordCalendarService {
+ private final RecordCalendarMapper recordCalendarMapper;
+
+ @Override
+ public List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO) {
+ int lastDay = reqVO.getSearchDate().withDayOfMonth(reqVO.getSearchDate().lengthOfMonth()).getDayOfMonth();
+
+ List list = recordCalendarMapper.getCalendarByDailyRecord(reqVO);
+
+ List refineList = new ArrayList();
+ for (DailyRecordCalendarDto record : list) {
+ record.setStartDate(reqVO.getSearchMonth() + String.format("%02d", record.getStartDay()));
+
+ if ((lastDay == 28 || lastDay == 30) && record.getStartDay() == lastDay) {
+ record.setEndDay(lastDay);
+ refineList.add(record);
+ } else if (record.getStartDay() <= lastDay && record.getEndDay() <= lastDay) {
+ refineList.add(record);
+ }
+ }
+
+ return refineList;
+ }
+
+ @Override
+ public DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO) {
+ return recordCalendarMapper.getDailyRecordStatus(reqVO);
+ }
+
+ @Override
+ public int getStartDayByDailyGroupNo(RecordCalendarUIReqVO reqVO) {
+ return recordCalendarMapper.getStartDayByDailyGroupNo(reqVO.getGroupNo());
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java
new file mode 100644
index 00000000..e546c3c4
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java
@@ -0,0 +1,66 @@
+package app.module.front.usecase.daily.calendar.web;
+
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto;
+import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto;
+import app.module.front.usecase.daily.calendar.service.RecordCalendarService;
+import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+@Slf4j
+@Controller
+@RequiredArgsConstructor
+@RequestMapping(path = "/record/calendar")
+public class RecordCalendarController {
+ private final RecordCalendarService recordCalendarService;
+
+ @GetMapping(path = "")
+ public String index(Model model, @RequestParam(value = "searchDay", required = false) String searchDay) {
+ RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchDay, getAccessId());
+ log.debug("reqVO: {}", reqVO);
+
+ model.addAttribute("reqVO", reqVO);
+ model.addAttribute("calendarList", recordCalendarService.getCalendarByDailyRecord(reqVO));
+
+ return "record/calendar";
+ }
+
+ @PostMapping(path = "/{searchMonth}/{groupNo}")
+ public String detail(Model model
+ , @PathVariable(required = true) String searchMonth
+ , @PathVariable(required = true) String groupNo) {
+
+ RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO();
+ reqVO.setSearchMonth(searchMonth);
+ reqVO.setGroupNo(Integer.parseInt(groupNo));
+ reqVO.setHouseholdSeq(getAccessId());
+ log.debug("reqVO: {}", reqVO);
+
+ DailyRecordStatusDto detail = recordCalendarService.getDailyRecordStatus(reqVO);
+ if (detail == null) {
+ int startDay = recordCalendarService.getStartDayByDailyGroupNo(reqVO);
+ reqVO.setSearchDay(reqVO.getSearchMonth() + String.format("%02d", startDay));
+ }
+
+ //uiCodeListPortIn.connect("code.pageable.rows");
+
+ model.addAttribute("reqVO", reqVO);
+ model.addAttribute("detail", detail);
+
+ return "record/calendar-wrap";
+ }
+
+ // TODO : 로그인 SEQ
+ private Long getAccessId() {
+ return 2L;
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java
new file mode 100644
index 00000000..2d1c1b5e
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java
@@ -0,0 +1,73 @@
+package app.module.front.usecase.daily.calendar.web.model;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.apache.tika.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.Date;
+import java.util.Locale;
+
+@Data
+@ToString
+public class RecordCalendarUIReqVO {
+ private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class);
+
+ public RecordCalendarUIReqVO() {
+ }
+
+ public RecordCalendarUIReqVO(String searchDay, Long accessId) {
+ if (StringUtils.isBlank(searchDay) || searchDay.length() != 8) {
+ searchDay = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ }
+
+ try {
+ SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN);
+ SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN);
+ SimpleDateFormat monthSdf = new SimpleDateFormat("yyyyMM", Locale.KOREAN);
+
+ Date formatDate = beforeSdf.parse(searchDay);
+
+ setSearchDate(LocalDate.parse(afterSdf.format(formatDate)));
+ setSearchMonth(monthSdf.format(formatDate));
+ setSearchDay(beforeSdf.format(formatDate));
+
+ } catch (Exception e) {
+ LOGGER.warn("[DateParse] target={}", searchDay, e);
+ }
+
+ setHouseholdSeq(accessId);
+ }
+
+ /**
+ * 검색 일(yyyyMMdd)
+ */
+ private String searchDay;
+
+ /**
+ * 검색 월(yyyyMM)
+ */
+ private String searchMonth;
+ private Integer groupNo;
+
+ /**
+ * 검색 일(yyyy-MM-dd)
+ */
+ private LocalDate searchDate;
+
+ /**
+ * 임가회원 일련번호
+ */
+ private Long householdSeq;
+
+
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java
new file mode 100644
index 00000000..d8a0352a
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java
@@ -0,0 +1,41 @@
+package app.module.front.usecase.daily.income.web;
+
+import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO;
+import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
+import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Slf4j
+@Controller
+@RequiredArgsConstructor
+@RequestMapping(path = "/record/income")
+public class DailyIncomeController {
+
+ @GetMapping(path = "/{searchMonth}/{groupNo}")
+ public String index(Model model
+ , @PathVariable(required = true) String searchMonth
+ , @PathVariable(required = true) String groupNo) {
+
+ DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO();
+ reqVO.setSearchMonth(searchMonth);
+ reqVO.setGroupNo(Integer.parseInt(groupNo));
+ reqVO.setHouseholdSeq(getAccessId());
+ log.debug("reqVO: {}", reqVO);
+
+ model.addAttribute("reqVO", reqVO);
+ model.addAttribute("detail", null);
+
+ return "record/income/index";
+ }
+
+ // TODO : 로그인 SEQ
+ private Long getAccessId() {
+ return 2L;
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java
new file mode 100644
index 00000000..fd54204e
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java
@@ -0,0 +1,12 @@
+package app.module.front.usecase.daily.income.web.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class DailyIncomeUIReqVO {
+ private String searchMonth;
+ private Integer groupNo;
+ private Long householdSeq;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java b/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java
new file mode 100644
index 00000000..1e1b717e
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java
@@ -0,0 +1,37 @@
+package app.module.front.usecase.daily.record.persistence;
+
+import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
+import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
+import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
+import app.module.front.usecase.daily.record.web.model.UpdateDailyRecordStatusCmd;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface DailyRecordMapper {
+
+ DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO);
+
+ /**
+ * 일계부 등록 여부
+ * @param householdSeq
+ * @param recordMonth
+ * @param dayGroupNo
+ * @return
+ */
+ Long getDailyRecordExistCount(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
+
+ /**
+ * 일계부 등록(생성)
+ * @param command
+ * @return
+ */
+ Long createDailyRecord(CreateDailyRecordReqVO command);
+
+ /**
+ * 일계부 상태 수정
+ * @param command
+ * @return
+ */
+ int updateDailyRecordStatus(UpdateDailyRecordStatusCmd command);
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java
new file mode 100644
index 00000000..af272e83
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java
@@ -0,0 +1,33 @@
+package app.module.front.usecase.daily.record.persistence.model;
+
+import lombok.Data;
+import lombok.Setter;
+
+import java.time.LocalDate;
+
+@Data
+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 Integer groupNo;
+ private Integer startDay;
+ private Integer endDay;
+
+ private Long id;
+ // TODO enum
+ private LocalDate startDate;
+ private LocalDate endDate;
+ private String allStatus;
+ private String incomeStatus;
+
+ public boolean isUpdated() {
+ boolean returnValue = false;
+ if (id != null) {
+ returnValue = true;
+ }
+ return returnValue;
+ }
+
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java
new file mode 100644
index 00000000..a54397e5
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java
@@ -0,0 +1,14 @@
+package app.module.front.usecase.daily.record.persistence.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateDailyRecordDto {
+ private String monthly;
+ private String updatedBy;
+ private String statusType;
+ private String statusCode;
+
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java
new file mode 100644
index 00000000..a8cbf9d0
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java
@@ -0,0 +1,11 @@
+package app.module.front.usecase.daily.record.service;
+
+import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
+import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
+import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
+
+public interface DailyRecordService {
+ DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO);
+
+ void createDailyRecord(CreateDailyRecordReqVO command);
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java
new file mode 100644
index 00000000..875cabe3
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java
@@ -0,0 +1,72 @@
+package app.module.front.usecase.daily.record.service;
+
+import app.module.front.usecase.daily.record.persistence.DailyRecordMapper;
+import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
+import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
+import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
+import app.module.front.usecase.daily.record.web.model.DailyStatus;
+import app.module.front.usecase.daily.record.web.model.DailyTargetStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Locale;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DailyRecordServiceImpl implements DailyRecordService {
+ private final DailyRecordMapper dailyRecordMapper;
+
+ @Override
+ public DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO) {
+ DailyRecordDto detail = dailyRecordMapper.getDailyRecord(reqVO);
+ if (detail != null && !detail.isUpdated()) {
+ try {
+ SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN);
+ SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN);
+
+ Date formatDate = beforeSdf.parse(reqVO.getSearchMonth() + String.format("%02d", detail.getStartDay()));
+ detail.setStartDate(LocalDate.parse(afterSdf.format(formatDate)));
+
+ formatDate = beforeSdf.parse(reqVO.getSearchMonth() + String.format("%02d", detail.getEndDay()));
+ detail.setEndDate(LocalDate.parse(afterSdf.format(formatDate)));
+
+ } catch (Exception e) {
+ log.warn("[DateParse] target={}", detail.getStartDay(), e);
+ }
+ }
+ return detail;
+ }
+
+ @Override
+ public void createDailyRecord(CreateDailyRecordReqVO command) {
+
+ if ("Y".equals(command.getTodayNone())) {
+ command.setAllStatus(DailyStatus.TODAY_NONE);
+ } else {
+ command.setAllStatus(DailyStatus.WAITING);
+
+ if (command.getIncomeStatus() == null) {
+ command.setIncomeStatus(DailyTargetStatus.NONE);
+ }
+ if (command.getWorkStatus() == null) {
+ command.setWorkStatus(DailyTargetStatus.NONE);
+ }
+ if (command.getExpenseStatus() == null) {
+ command.setExpenseStatus(DailyTargetStatus.NONE);
+ }
+ if (command.getPowerStatus() == null) {
+ command.setPowerStatus(DailyTargetStatus.NONE);
+ }
+ if (command.getForestryStatus() == null) {
+ command.setForestryStatus(DailyTargetStatus.NONE);
+ }
+ }
+
+ dailyRecordMapper.createDailyRecord(command);
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java
new file mode 100644
index 00000000..19fda703
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java
@@ -0,0 +1,87 @@
+package app.module.front.usecase.daily.record.web;
+
+import app.module.front.usecase.daily.calendar.service.RecordCalendarService;
+import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
+import app.module.front.usecase.daily.record.service.DailyRecordService;
+import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
+import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
+import app.module.front.usecase.daily.record.web.validator.CreateDailyRecordValidator;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@Controller
+@RequiredArgsConstructor
+@RequestMapping(path = "/record/daily")
+public class DailyRecordController {
+ private final RecordCalendarService recordCalendarService;
+ private final DailyRecordService dailyRecordService;
+ private final CreateDailyRecordValidator createDailyRecordValidator;;
+
+ @GetMapping(path = "/{searchMonth}/{groupNo}")
+ public String createForm(Model model
+ , @PathVariable(required = true) String searchMonth
+ , @PathVariable(required = true) String groupNo) {
+
+ DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO();
+ reqVO.setSearchMonth(searchMonth);
+ reqVO.setGroupNo(Integer.parseInt(groupNo));
+ reqVO.setHouseholdSeq(getAccessId());
+ log.debug("reqVO: {}", reqVO);
+
+ //uiCodeListPortIn.connect("code.pageable.rows");
+
+ DailyRecordDto detail = dailyRecordService.getDailyRecord(reqVO);
+
+ model.addAttribute("reqVO", reqVO);
+ model.addAttribute("detail", detail);
+
+ return "record/daily";
+ }
+
+ @PostMapping(path = "/{searchMonth}/{groupNo}")
+ ResponseEntity> create(@PathVariable(required = true) String searchMonth
+ , @PathVariable(required = true) String groupNo
+ , @Valid @RequestBody CreateDailyRecordReqVO formVO, BindingResult bindingResult) {
+
+ createDailyRecordValidator.validate(formVO, bindingResult);
+ if (bindingResult.hasErrors()) {
+ return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
+ .body(bindingResult.getFieldErrors());
+ }
+
+ DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO();
+ reqVO.setSearchMonth(searchMonth);
+ reqVO.setGroupNo(Integer.parseInt(groupNo));
+ reqVO.setHouseholdSeq(getAccessId());
+ log.debug("reqVO: {}", reqVO);
+
+ //uiCodeListPortIn.connect("code.pageable.rows");
+
+ DailyRecordDto detail = dailyRecordService.getDailyRecord(reqVO);
+
+ formVO.setHouseholdSeq(reqVO.getHouseholdSeq());
+ formVO.setRecordMonth(reqVO.getSearchMonth());
+ formVO.setDayGroupNo(reqVO.getGroupNo());
+ formVO.setStartDate(detail.getStartDate());
+ formVO.setEndDate(detail.getEndDate());
+
+ log.debug("formVO: {}", formVO);
+ dailyRecordService.createDailyRecord(formVO);
+ log.debug("createDailyRecord: id-{}", formVO.getId());
+
+ return ResponseEntity.status(HttpStatus.OK).body(reqVO);
+ }
+
+ // TODO : 로그인 SEQ
+ private Long getAccessId() {
+ return 2L;
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java
new file mode 100644
index 00000000..1c57e7a9
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java
@@ -0,0 +1,29 @@
+package app.module.front.usecase.daily.record.web.model;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDate;
+import java.util.Date;
+
+@Data
+public class CreateDailyRecordReqVO {
+ private Long id;
+ private Long householdSeq;
+ private String recordMonth;
+ private int dayGroupNo;
+ private LocalDate startDate;
+ private LocalDate endDate;
+ // TODO : 전체 상태값 정의 ING, DONE
+ private String todayNone;
+ private DailyStatus allStatus;
+ // TODO : 개별 상태값 정의 WAITING, TYPING, TODAY_NONE, NONE, DONE
+ private DailyTargetStatus incomeStatus;
+ private DailyTargetStatus workStatus;
+ private DailyTargetStatus expenseStatus;
+ private DailyTargetStatus powerStatus;
+ private DailyTargetStatus forestryStatus;
+ // TODO : 무슨 데이터 넣을 것인가?
+ private String createdBy;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java
new file mode 100644
index 00000000..3b35aaf4
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java
@@ -0,0 +1,12 @@
+package app.module.front.usecase.daily.record.web.model;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class DailyRecordUIReqVO {
+ private String searchMonth;
+ private Integer groupNo;
+ private Long householdSeq;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java
new file mode 100644
index 00000000..6592e3ec
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java
@@ -0,0 +1,5 @@
+package app.module.front.usecase.daily.record.web.model;
+
+public enum DailyStatus {
+ WAITING, TODAY_NONE, DONE;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java
new file mode 100644
index 00000000..0e186e60
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java
@@ -0,0 +1,5 @@
+package app.module.front.usecase.daily.record.web.model;
+
+public enum DailyTargetStatus {
+ WAITING, TODAY_NONE, NONE, DONE;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java
new file mode 100644
index 00000000..d50bdd85
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java
@@ -0,0 +1,20 @@
+package app.module.front.usecase.daily.record.web.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UpdateDailyRecordStatusCmd {
+ private Long id;
+ private Long householdSeq;
+ private String recordMonth;
+ private int dayGroupNo;
+ // TODO : 전체 상태값 정의 ING, DONE
+ private String allStatus;
+ // TODO : 개별 상태값 정의 WAITING, TYPING, TODAY_NONE, NONE, DONE
+ private String targetType;
+ private String targetStatus;
+ // TODO : 무슨 데이터 넣을 것인가?
+ private String updatedBy;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java b/front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java
new file mode 100644
index 00000000..3e0abe60
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java
@@ -0,0 +1,50 @@
+package app.module.front.usecase.daily.record.web.validator;
+
+import app.module.core.config.application.util.MessageUtil;
+import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
+import lombok.RequiredArgsConstructor;
+import org.apache.tika.utils.StringUtils;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import org.springframework.validation.Validator;
+
+@Component
+@RequiredArgsConstructor
+public class CreateDailyRecordValidator implements Validator {
+ private final MessageUtil messageUtil;
+
+ @Override
+ public boolean supports(Class> clazz) {
+ return CreateDailyRecordReqVO.class.equals(clazz);
+ }
+
+ @Override
+ public void validate(Object target, Errors errors) {
+ CreateDailyRecordReqVO vo = (CreateDailyRecordReqVO) target;
+
+ if (StringUtils.isBlank(vo.getTodayNone())) {
+ int noneCount = 0;
+ if (vo.getIncomeStatus() != null) {
+ noneCount++;
+ }
+ if (vo.getWorkStatus() != null) {
+ noneCount++;
+ }
+ if (vo.getExpenseStatus() != null) {
+ noneCount++;
+ }
+ if (vo.getPowerStatus() != null) {
+ noneCount++;
+ }
+ if (vo.getForestryStatus() != null) {
+ noneCount++;
+ }
+
+ if (noneCount == 0) {
+ errors.rejectValue(
+ "incomeStatus", "valid.common.required",
+ messageUtil.getMessage("valid.common.required"));
+ }
+ }
+ }
+}
diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml
new file mode 100644
index 00000000..3269dc17
--- /dev/null
+++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+ insert into daily_record (
+ 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
+ ) values (
+ #{householdSeq}
+ , #{recordMonth}, #{dayGroupNo}, #{startDate}, #{endDate}
+ , #{allStatus}, #{incomeStatus}, #{workStatus}, #{expenseStatus}, #{powerStatus}, #{forestryStatus}
+ , now(), #{createdBy}, false
+ )
+
+
+
+ update daily_record set
+ updated_at = now()
+ , updated_by = #{updatedBy}
+
+ , all_status = #{allStatus}
+
+
+ /* TODO 개별 상태값 변경 */
+
+
+ , income_status = #{targetStatus}
+
+
+
+ where is_deleted = false
+ and household_seq = #{householdSeq}
+ and record_month = #{recordMonth}
+ and day_group_no = #{dayGroupNo}
+
+
+
+ /* TODO */
+ inner join daily_record dr on
+ dr.id = ds.daily_record_seq
+ and dr.is_deleted = false
+ and dr.recordMonth = #{recordMonth} and dr.day_group_no = #{dayGroupNo}
+ and dr.household_seq = #{householdSeq}
+
+
+
diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml
new file mode 100644
index 00000000..d985da83
--- /dev/null
+++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /* TODO */
+ inner join daily_record dr on
+ dr.id = ds.daily_record_seq
+ and dr.is_deleted = false
+ and dr.recordMonth = #{recordMonth} and dr.day_group_no = #{dayGroupNo}
+ and dr.household_seq = #{householdSeq}
+
+
+
diff --git a/front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js b/front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js
new file mode 100644
index 00000000..7f37b5d9
--- /dev/null
+++ b/front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,""],col:[2,""],tr:[2,""],td:[3,""],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0 {
+ // TODO : form id? or body
+ let target = $('body').find('[name=' + oj.field + ']');
+ target.addClass('is-invalid');
+
+ target.parent().find('.invalid-feedback').text(oj.defaultMessage);
+ });
+ },
+ 500:function(rstData){
+ ajaxUtil._hideWaiting();
+ if (rstData.responseText != '') {
+ let resultJSON = ajaxUtil._jsonParse(rstData.responseText);
+ if (rstData.responseJSON != undefined) {
+ resultJSON = rstData.responseJSON;
+ }
+
+ if (resultJSON.code == 1064) {
+ ajaxUtil._alert(resultJSON.message, '확인');
+ } else if (typeof errorCallback !== 'undefined') {
+ errorCallback(ajaxUtil.$500, rstData);
+ }
+ } else if (typeof errorCallback !== 'undefined') {
+ errorCallback(ajaxUtil.$500, rstData);
+ }
+ }
+ },
+ success : function(rstData, status) {
+ ajaxUtil._hideWaiting();
+ if (typeof successCallback !== 'undefined') {
+ successCallback(rstData, status);
+ }
+ },
+ error : function(rstData) {
+ ajaxUtil._hideWaiting();
+ if (!(rstData.status == 500 || rstData.status == 422)) {
+ if (typeof errorCallback !== 'undefined') {
+ errorCallback(rstData.status, rstData);
+ } else {
+ ajaxUtil._alertError(ajaxUtil._msg500);
+ }
+ }
+ },
+ complete : function(xhr, status, err) {
+ ajaxUtil._hideWaiting();
+ if (typeof ENV != 'undefined' && typeof ENV.submitted == 'boolean') {
+ ENV.submitted = false;
+ }
+ if (typeof commentENV != 'undefined' && typeof commentENV.submitted == 'boolean') {
+ commentENV.submitted = false;
+ }
+ },
+ });
+ },
+
+
+ _jsonParse : function parse(jsonStr) {
+ try {
+ var jsonObj = JSON.parse(jsonStr);
+ // chamobile.logger.debug(jsonObj);
+ return jsonObj;
+ } catch (error) {
+ console.error("Invalid JSON string:", error);
+ }
+ return null;
+ },
+ _jsonStringify : function stringify(obj) {
+ try {
+ var jsonStr = JSON.stringify(obj);
+ // chamobile.logger.debug(jsonStr);
+ return jsonStr;
+ } catch (error) {
+ console.error("Error stringifying object:", error);
+ }
+ return null;
+ },
+
+
+ _goToMain:function() {
+ location.href = '/';
+ },
+ _hideWaiting:function(){
+ if (ajaxUtil.loadingStatus) {
+ ajaxUtil.loadingStatus = false;
+ // TODO : 로딩바 숨김
+ }
+ },
+ _showWaiting:function(){
+ ajaxUtil.loadingStatus = true;
+ // TODO : 로딩바 활성화
+ },
+};
\ No newline at end of file
diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js
new file mode 100644
index 00000000..c4cc1ccc
--- /dev/null
+++ b/front/src/main/resources/static/ui/commonUtil.js
@@ -0,0 +1,33 @@
+
+
+var research = {};
+research.json = new Object();
+research.logger = new Object();
+
+/* research.logger */
+/**
+ * client 오류성 로그 기록용 로거, 로그 레벨에 따라 표시
+ * @param message
+ * @param el
+ */
+research.logger.debug = function(message, el){
+ var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+ console.log("[DEBUG] caller : " + callee + " / message : " + message, el);
+};
+
+research.logger.error = function(message, el){
+ var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+ console.error("[ERROR] caller : " + callee + " / message : " + message, el);
+};
+
+research.logger.info = function(message){
+ var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+ console.info("[INFO] caller : " + callee + " / message : " + message);
+};
+
+research.logger.warn = function(message){
+ var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+ console.warn("[WARN] caller : " + callee + " / message : " + message);
+};
+
+
diff --git a/front/src/main/resources/static/ui/page/daily-record.js b/front/src/main/resources/static/ui/page/daily-record.js
new file mode 100644
index 00000000..6f53e9bc
--- /dev/null
+++ b/front/src/main/resources/static/ui/page/daily-record.js
@@ -0,0 +1,30 @@
+var page = {};
+page.daily = new Object();
+
+page.daily.httpUrl = {
+ root: '/record/calendar',
+ daily: '/record/daily/{searchMonth}/{groupNo}',
+ income: '/record/income/{searchMonth}/{groupNo}',
+ work: '/record/work/{searchMonth}/{groupNo}',
+ expense: '/record/expense/{searchMonth}/{groupNo}',
+ power: '/record/power/{searchMonth}/{groupNo}',
+ forestry: '/record/forestry/{searchMonth}/{groupNo}',
+}
+
+page.daily.goToMain = function() {
+ location.href = page.daily.httpUrl.root;
+}
+
+page.daily.goToNext = function(target, searchMonth, groupNo) {
+ let url = page.daily.httpUrl.root;
+
+ // TODO URL
+ if (target == 'income') {
+ url = page.daily.httpUrl.income;
+ } else if (target == 'work') {
+ url = page.daily.httpUrl.work;
+ }
+
+ console.log(url.replace('{searchMonth}', searchMonth).replace('{groupNo}', groupNo));
+ //location.href = url.replace('{searchMonth}', searchMonth).replace('{groupNo}', groupNo);
+}
\ No newline at end of file
diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html
index 8ad940b4..ea541474 100644
--- a/front/src/main/resources/templates/common/components.html
+++ b/front/src/main/resources/templates/common/components.html
@@ -25,10 +25,12 @@
-
+
+
+
diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html
index 2906b1f3..5b87ca3b 100644
--- a/front/src/main/resources/templates/layout/layout.html
+++ b/front/src/main/resources/templates/layout/layout.html
@@ -16,6 +16,8 @@
+
+
diff --git a/front/src/main/resources/templates/record/calendar-wrap.html b/front/src/main/resources/templates/record/calendar-wrap.html
new file mode 100644
index 00000000..c981edb8
--- /dev/null
+++ b/front/src/main/resources/templates/record/calendar-wrap.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+ reqVO: [[${reqVO}]]
+
+
+
+ [[${#temporals.format(detail.startDate, 'yyyy년 MM월 dd일')}]] ~ [[${#temporals.format(detail.endDate, 'yyyy년 MM월 dd일')}]]
+
+ 수입 : [[${detail.incomeStatus}]], [[${detail.incomeCount}]]
+ 수정
+
+
+
+ detail: [[${detail}]]
+
+
+
+
+ [[${#temporals.format(searchDate, 'yyyy년 MM월 dd일')}]]
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html
new file mode 100644
index 00000000..b89be442
--- /dev/null
+++ b/front/src/main/resources/templates/record/calendar.html
@@ -0,0 +1,74 @@
+
+
+
+
+ calendar
+
+ reqVO: [[${reqVO}]]
+
+
+
+
+
+ No=[[${calendar.groupNo}]], Start=[[${calendar.startDay}]], End=[[${calendar.endDay}]], StartDate=[[${calendar.startDate}]], Id=[[${calendar.dailyId}]]
+
+
+
+
+ No=[[${calendar.groupNo}]], Start=[[${calendar.startDay}]], End=[[${calendar.endDay}]], StartDate=[[${calendar.startDate}]]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily.html
new file mode 100644
index 00000000..2bf28cc2
--- /dev/null
+++ b/front/src/main/resources/templates/record/daily.html
@@ -0,0 +1,94 @@
+
+
+
+
+ daily Form
+
+ reqVO: [[${reqVO}]]
+
+
+ [[${#temporals.format(detail.startDate, 'yyyy년 MM월 dd일')}]] ~ [[${#temporals.format(detail.endDate, 'yyyy년 MM월 dd일')}]]
+
+
+
+
+
+
+
+ 수정
+
+
+
+
+
+
+ detail: [[${detail}]]
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html
new file mode 100644
index 00000000..c8a16ec1
--- /dev/null
+++ b/front/src/main/resources/templates/record/income/index.html
@@ -0,0 +1,35 @@
+
+
+
+
+ daily Form
+
+ reqVO: [[${reqVO}]]
+
+
+
+ detail: [[${detail}]]
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 97ed63c86629d4014c6165e8c1f091911003c691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?=
Date: Tue, 10 Jun 2025 10:09:04 +0900
Subject: [PATCH 2/8] =?UTF-8?q?[FO]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20househ?=
=?UTF-8?q?old=5Fseq=20=EC=B6=94=EA=B0=80,=20FrontAuditCommand=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../security/FrontDetailService.java | 1 +
.../security/FrontHouseholdUser.java | 3 ++
.../config/application/util/AuditUtil.java | 22 +++++++++++++++
.../config/application/util/AuthUtil.java | 28 +++++++++++++++++++
4 files changed, 54 insertions(+)
create mode 100644 front/src/main/java/app/module/front/config/application/util/AuditUtil.java
create mode 100644 front/src/main/java/app/module/front/config/application/util/AuthUtil.java
diff --git a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java
index 0d6b906e..3056c07d 100644
--- a/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java
+++ b/front/src/main/java/app/module/front/config/application/security/FrontDetailService.java
@@ -40,6 +40,7 @@ public class FrontDetailService implements UserDetailsService {
.orElseThrow(() -> new UsernameNotFoundException("Invalid username or password."));
return new FrontHouseholdUser(
+ getHousehold.getSeq(),
getHousehold.getHouseholdNum(),
getHousehold.getPassword(),
true,
diff --git a/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java
index 4937504d..a3dc23f6 100644
--- a/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java
+++ b/front/src/main/java/app/module/front/config/application/security/FrontHouseholdUser.java
@@ -8,9 +8,11 @@ import org.springframework.security.core.userdetails.User;
@Getter
public class FrontHouseholdUser extends User {
+ private Long householdSeq;
private String ownerName;
public FrontHouseholdUser(
+ Long householdSeq,
String householdNum,
String password,
boolean enabled,
@@ -27,6 +29,7 @@ public class FrontHouseholdUser extends User {
credentialsNonExpired,
accountNonLocked,
authorities);
+ this.householdSeq = householdSeq;
this.ownerName = ownerName;
}
}
diff --git a/front/src/main/java/app/module/front/config/application/util/AuditUtil.java b/front/src/main/java/app/module/front/config/application/util/AuditUtil.java
new file mode 100644
index 00000000..700aec6c
--- /dev/null
+++ b/front/src/main/java/app/module/front/config/application/util/AuditUtil.java
@@ -0,0 +1,22 @@
+package app.module.front.config.application.util;
+
+import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
+
+public class AuditUtil {
+ private AuditUtil() {}
+
+ public static T create(T cmd) {
+ cmd.create();
+ return cmd;
+ }
+
+ public static T update(T cmd) {
+ cmd.update();
+ return cmd;
+ }
+
+ public static T delete(T cmd) {
+ cmd.delete();
+ return cmd;
+ }
+}
diff --git a/front/src/main/java/app/module/front/config/application/util/AuthUtil.java b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java
new file mode 100644
index 00000000..59d3fc2f
--- /dev/null
+++ b/front/src/main/java/app/module/front/config/application/util/AuthUtil.java
@@ -0,0 +1,28 @@
+package app.module.front.config.application.util;
+
+import app.module.core.config.adapters.web.security.domain.SocialUser;
+import app.module.front.config.application.security.FrontHouseholdUser;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
+import org.springframework.stereotype.Component;
+
+@Component
+public class AuthUtil {
+ public static Long getUserSeq() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication == null) {
+ return null;
+ }
+
+ Object principal = authentication.getPrincipal();
+ Long userseq = null;
+
+ if (principal instanceof UserDetails) {
+ userseq = ((FrontHouseholdUser) principal).getHouseholdSeq();
+ }
+
+ return userseq;
+ }
+}
From b6aeb92597125fea1d840838726ff5db0d246403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?=
Date: Tue, 10 Jun 2025 10:31:20 +0900
Subject: [PATCH 3/8] =?UTF-8?q?[DB]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?=
=?UTF-8?q?=EC=88=98=EC=9E=85,=20=EC=A7=80=EC=B6=9C=20input=5Ftype=20?=
=?UTF-8?q?=EC=B6=94=EA=B0=80,=20category=5Fself=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/sql/schema/02_create-record.sql | 35 ++++++++++---------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql
index 2500e6f9..4f125edb 100644
--- a/core/src/main/resources/sql/schema/02_create-record.sql
+++ b/core/src/main/resources/sql/schema/02_create-record.sql
@@ -19,7 +19,6 @@ DROP SEQUENCE IF EXISTS daily_power_seq;
DROP SEQUENCE IF EXISTS daily_forestry_seq;
DROP SEQUENCE IF EXISTS daily_farming_seq;
DROP SEQUENCE IF EXISTS daily_record_seq;
-DROP SEQUENCE IF EXISTS daily_day_group_pkey;
*/
@@ -142,15 +141,16 @@ CREATE SEQUENCE daily_income_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_income (
id bigint DEFAULT nextval('daily_income_seq') NOT NULL, -- 일계부 수입 ID
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ input_type varchar(5), -- 입력 구분(SELF, OCR)
is_credit boolean, -- 외상판매 여부
crop_code varchar(255), -- 재배형태 코드 (매핑코드)
- category_code varchar(255) NULL, -- 수입 종류(매핑코드)
- category_name varchar(30) NULL, -- 수입 종류(직접입력)
+ category_code varchar(255), -- 수입 종류(매핑코드)
+ category_self varchar(30), -- 수입 종류(직접입력)
source_purpose varchar(10), -- 수입원(용도)
- quantity decimal(6,2) NOT NULL, -- 수량
- unit_code varchar(255) NOT NULL, -- 단위 (매핑코드)
- price integer NULL, -- 현금(원)
- estimated_value integer NULL, -- 현물(평가액)
+ quantity decimal(6,2), -- 수량
+ unit_code varchar(255), -- 단위 (매핑코드)
+ price integer, -- 현금(원)
+ estimated_value integer, -- 현물(평가액)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
@@ -167,10 +167,11 @@ COMMENT ON TABLE daily_income IS '수입내역 - 일계부';
COMMENT ON COLUMN daily_income.id IS '일계부 수입 ID';
COMMENT ON COLUMN daily_income.daily_record_seq IS '일계부 작성상태 일련번호';
+COMMENT ON COLUMN daily_income.input_type IS '입력 구분(SELF, OCR)';
COMMENT ON COLUMN daily_income.is_credit IS '외상판매 여부';
COMMENT ON COLUMN daily_income.crop_code IS '재배형태 코드 (매핑코드)';
COMMENT ON COLUMN daily_income.category_code IS '수입 종류(매핑코드)';
-COMMENT ON COLUMN daily_income.category_name IS '수입 종류(직접입력)';
+COMMENT ON COLUMN daily_income.category_self IS '수입 종류(직접입력)';
COMMENT ON COLUMN daily_income.source_purpose IS '수입원(용도)';
COMMENT ON COLUMN daily_income.quantity IS '수량';
COMMENT ON COLUMN daily_income.unit_code IS '단위 (매핑코드)';
@@ -194,15 +195,16 @@ CREATE SEQUENCE daily_expense_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE;
CREATE TABLE daily_expense (
id bigint DEFAULT nextval('daily_expense_seq') NOT NULL, -- 일계부 지출 ID
daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK)
+ input_type varchar(5), -- 입력 구분(SELF, OCR)
is_credit boolean, -- 외상판매 여부
crop_code varchar(255), -- 재배형태 코드 (매핑코드)
- category_code varchar(255) NOT NULL, -- 지출 종류(매핑코드)
- category_name varchar(30) NOT NULL, -- 지출 종류(직접입력)
- source_purpose varchar(10), -- 지출원(용도)
- quantity decimal(6,2) NOT NULL, -- 수량
- unit_code varchar(10) NOT NULL, -- 단위 (매핑코드)
- price integer NOT NULL, -- 현금(원)
- estimated_value integer NOT NULL, -- 현물(평가액)
+ category_code varchar(255), -- 수입 종류(매핑코드)
+ category_self varchar(30), -- 수입 종류(직접입력)
+ source_purpose varchar(10), -- 수입원(용도)
+ quantity decimal(6,2), -- 수량
+ unit_code varchar(255), -- 단위 (매핑코드)
+ price integer, -- 현금(원)
+ estimated_value integer, -- 현물(평가액)
created_at timestamp(6), -- 생성일
created_by varchar(255), -- 생성자
updated_at timestamp(6), -- 수정일
@@ -219,10 +221,11 @@ COMMENT ON TABLE daily_expense IS '지출내역 - 일계부';
COMMENT ON COLUMN daily_expense.id IS '일계부 지출 ID';
COMMENT ON COLUMN daily_expense.daily_record_seq IS '일계부 작성상태 일련번호';
+COMMENT ON COLUMN daily_expense.input_type IS '입력 구분(SELF, OCR)';
COMMENT ON COLUMN daily_expense.is_credit IS '외상판매 여부';
COMMENT ON COLUMN daily_expense.crop_code IS '재배형태 코드 (매핑코드)';
COMMENT ON COLUMN daily_expense.category_code IS '지출 종류(매핑코드)';
-COMMENT ON COLUMN daily_expense.category_name IS '지출 종류(직접입력)';
+COMMENT ON COLUMN daily_expense.category_self IS '지출 종류(직접입력)';
COMMENT ON COLUMN daily_expense.source_purpose IS '지출원(용도)';
COMMENT ON COLUMN daily_expense.quantity IS '수량';
COMMENT ON COLUMN daily_expense.unit_code IS '단위 (매핑코드)';
From d352b27c3e080b3f11151e5f1c6a3e3f2b358eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?=
Date: Tue, 10 Jun 2025 11:06:07 +0900
Subject: [PATCH 4/8] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?=
=?UTF-8?q?=EB=93=B1=EB=A1=9D=20wip,=20FrontAuditCommand=20=EC=BB=A4?=
=?UTF-8?q?=EB=B0=8B=20=EB=88=84=EB=9D=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../component/FrontAuditCommand.java | 63 ++++++++++++++++
.../application/model/DailyIncomeCmd.java | 24 ++++++
.../income/persistence/DailyIncomeMapper.java | 58 +++++++++++++++
.../persistence/model/DailyIncomeDto.java | 21 ++++++
.../income/web/DailyIncomeController.java | 14 ++--
.../service/DailyRecordServiceImpl.java | 3 +-
.../record/web/DailyRecordController.java | 10 +--
.../web/model/CreateDailyRecordReqVO.java | 10 +--
.../mappers/daily/DailyIncomeMapper.xml | 73 +++++++++++++++++++
.../mappers/daily/DailyRecordMapper.xml | 10 +--
.../main/resources/messages/uri.properties | 13 +++-
.../src/main/resources/static/ui/ajaxUtil.js | 11 +--
.../main/resources/static/ui/commonUtil.js | 33 +++++----
.../resources/static/ui/page/daily-record.js | 58 ++++++++-------
.../templates/common/components.html | 5 ++
.../resources/templates/record/calendar.html | 2 +-
.../resources/templates/record/daily.html | 38 +++++++++-
17 files changed, 368 insertions(+), 78 deletions(-)
create mode 100644 front/src/main/java/app/module/front/config/adapters/persistence/component/FrontAuditCommand.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/income/application/model/DailyIncomeCmd.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java
create mode 100644 front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java
create mode 100644 front/src/main/resources/mappers/daily/DailyIncomeMapper.xml
diff --git a/front/src/main/java/app/module/front/config/adapters/persistence/component/FrontAuditCommand.java b/front/src/main/java/app/module/front/config/adapters/persistence/component/FrontAuditCommand.java
new file mode 100644
index 00000000..f423c42e
--- /dev/null
+++ b/front/src/main/java/app/module/front/config/adapters/persistence/component/FrontAuditCommand.java
@@ -0,0 +1,63 @@
+package app.module.front.config.adapters.persistence.component;
+
+import app.module.core.config.application.util.CommonUtil;
+import app.module.front.config.application.security.FrontHouseholdUser;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class FrontAuditCommand {
+ private Long householdSeq;
+ private LocalDateTime createdAt;
+ private String createdBy;
+ private LocalDateTime updatedAt;
+ private String updatedBy;
+ private LocalDateTime deletedAt;
+ private String deletedBy;
+
+ public void create() {
+ this.householdSeq = getCurrentUserSeq();
+ this.createdAt = LocalDateTime.now();
+ this.createdBy = getCurrentUsername();
+ this.updatedAt = LocalDateTime.now();
+ this.updatedBy = getCurrentUsername();
+ }
+
+ public void update() {
+ this.householdSeq = getCurrentUserSeq();
+ this.updatedAt = LocalDateTime.now();
+ this.updatedBy = getCurrentUsername();
+ }
+
+ public void delete() {
+ this.householdSeq = getCurrentUserSeq();
+ this.deletedAt = LocalDateTime.now();
+ this.deletedBy = getCurrentUsername();
+ }
+
+ private Long getCurrentUserSeq() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+ Object principal = authentication.getPrincipal();
+ Long userseq = null;
+
+ if (principal instanceof UserDetails) {
+ userseq = ((FrontHouseholdUser) principal).getHouseholdSeq();
+ }
+
+ return userseq;
+ }
+
+ private String getCurrentUsername() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+ return authentication != null && authentication.isAuthenticated()
+ ? CommonUtil.getLoginUsername() : "INIT_DATA";
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/application/model/DailyIncomeCmd.java b/front/src/main/java/app/module/front/usecase/daily/income/application/model/DailyIncomeCmd.java
new file mode 100644
index 00000000..b4d7f38b
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/income/application/model/DailyIncomeCmd.java
@@ -0,0 +1,24 @@
+package app.module.front.usecase.daily.income.application.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DailyIncomeCmd {
+ private Long id;
+ private Long householdSeq;
+ private Boolean isCredit;
+ private String cropCode;
+ // TODO : 수입종류의 코드맵핑 여부 판단
+ private String categoryCode;
+ private String categoryName;
+ private String sourcePurpose;
+ // TODO : 타입
+ private String quantity;
+ private String unitCode;
+ private Integer price;
+ private Integer estimatedValue;
+ // TODO : 무슨 데이터 넣을 것인가?
+ private String createdBy;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java
new file mode 100644
index 00000000..c4ef1542
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/DailyIncomeMapper.java
@@ -0,0 +1,58 @@
+package app.module.front.usecase.daily.income.persistence;
+
+import app.module.front.usecase.daily.income.application.model.DailyIncomeCmd;
+import app.module.front.usecase.daily.income.persistence.model.DailyIncomeDto;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface DailyIncomeMapper {
+ /**
+ * 수입내역 데이터 존재 여부
+ * @param householdSeq
+ * @param recordMonth
+ * @param dayGroupNo
+ * @return
+ */
+ Long getDailyIncomeExistCount(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
+
+ /**
+ * 수입내역 목록 조회
+ * @param householdSeq
+ * @param recordMonth
+ * @param dayGroupNo
+ * @return
+ */
+ List getDailyIncomeList(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
+
+ /**
+ * 수입내역 단건 조회
+ * @param householdSeq
+ * @param recordMonth
+ * @param dayGroupNo
+ * @return
+ */
+ DailyIncomeDto getDailyIncome(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo);
+
+ /**
+ * 수입내역 등록
+ * @param command
+ * @return
+ */
+ Long createDailyIncome(DailyIncomeCmd command);
+
+ /**
+ * 수입내역 수정
+ * @param command
+ * @return
+ */
+ int updateDailyIncome(DailyIncomeCmd command);
+
+ /**
+ * 수입내역 삭제
+ * @return
+ */
+ int removeDailyIncome();
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java
new file mode 100644
index 00000000..c91ed920
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/daily/income/persistence/model/DailyIncomeDto.java
@@ -0,0 +1,21 @@
+package app.module.front.usecase.daily.income.persistence.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+public class DailyIncomeDto {
+ private Long id;
+ private Long householdSeq;
+ private Boolean isCredit;
+ // TODO
+ private String createdBy;
+ private LocalDateTime createdAt;
+ private Integer price;
+ private Integer estimatedValue;
+ private String updatedBy;
+ private LocalDateTime updatedAt;
+}
diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java
index d8a0352a..881efb7f 100644
--- a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java
+++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java
@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.income.web;
+import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO;
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO;
@@ -18,14 +19,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
public class DailyIncomeController {
@GetMapping(path = "/{searchMonth}/{groupNo}")
- public String index(Model model
- , @PathVariable(required = true) String searchMonth
- , @PathVariable(required = true) String groupNo) {
+ public String index(Model model,
+ @PathVariable(required = true) String searchMonth,
+ @PathVariable(required = true) String groupNo) {
DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO();
reqVO.setSearchMonth(searchMonth);
reqVO.setGroupNo(Integer.parseInt(groupNo));
- reqVO.setHouseholdSeq(getAccessId());
+ reqVO.setHouseholdSeq(AuthUtil.getUserSeq());
log.debug("reqVO: {}", reqVO);
model.addAttribute("reqVO", reqVO);
@@ -33,9 +34,4 @@ public class DailyIncomeController {
return "record/income/index";
}
-
- // TODO : 로그인 SEQ
- private Long getAccessId() {
- return 2L;
- }
}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java
index 875cabe3..2597e004 100644
--- a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java
+++ b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java
@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.record.service;
+import app.module.front.config.application.util.AuditUtil;
import app.module.front.usecase.daily.record.persistence.DailyRecordMapper;
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO;
@@ -67,6 +68,6 @@ public class DailyRecordServiceImpl implements DailyRecordService {
}
}
- dailyRecordMapper.createDailyRecord(command);
+ dailyRecordMapper.createDailyRecord(AuditUtil.create(command));
}
}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java
index 19fda703..c0ab0d42 100644
--- a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java
@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.record.web;
+import app.module.front.config.application.util.AuthUtil;
import app.module.front.usecase.daily.calendar.service.RecordCalendarService;
import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto;
import app.module.front.usecase.daily.record.service.DailyRecordService;
@@ -33,7 +34,7 @@ public class DailyRecordController {
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO();
reqVO.setSearchMonth(searchMonth);
reqVO.setGroupNo(Integer.parseInt(groupNo));
- reqVO.setHouseholdSeq(getAccessId());
+ reqVO.setHouseholdSeq(AuthUtil.getUserSeq());
log.debug("reqVO: {}", reqVO);
//uiCodeListPortIn.connect("code.pageable.rows");
@@ -60,7 +61,7 @@ public class DailyRecordController {
DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO();
reqVO.setSearchMonth(searchMonth);
reqVO.setGroupNo(Integer.parseInt(groupNo));
- reqVO.setHouseholdSeq(getAccessId());
+// reqVO.setHouseholdSeq(AuthUtil.getUserSeq());
log.debug("reqVO: {}", reqVO);
//uiCodeListPortIn.connect("code.pageable.rows");
@@ -79,9 +80,4 @@ public class DailyRecordController {
return ResponseEntity.status(HttpStatus.OK).body(reqVO);
}
-
- // TODO : 로그인 SEQ
- private Long getAccessId() {
- return 2L;
- }
}
diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java
index 1c57e7a9..4f52d5b5 100644
--- a/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java
+++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java
@@ -1,16 +1,14 @@
package app.module.front.usecase.daily.record.web.model;
+import app.module.front.config.adapters.persistence.component.FrontAuditCommand;
import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
import java.time.LocalDate;
-import java.util.Date;
@Data
-public class CreateDailyRecordReqVO {
+public class CreateDailyRecordReqVO extends FrontAuditCommand {
private Long id;
- private Long householdSeq;
+// private Long householdSeq;
private String recordMonth;
private int dayGroupNo;
private LocalDate startDate;
@@ -25,5 +23,5 @@ public class CreateDailyRecordReqVO {
private DailyTargetStatus powerStatus;
private DailyTargetStatus forestryStatus;
// TODO : 무슨 데이터 넣을 것인가?
- private String createdBy;
+// private String createdBy;
}
diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml
new file mode 100644
index 00000000..23153de5
--- /dev/null
+++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+ insert into daily_income (
+ daily_record_seq, is_credit, crop_code, category_code, category_name, source_purpose
+ , quantity, unit_code, price, estimated_value
+ , created_at, created_by, is_deleted
+ ) values (
+ #{householdSeq}
+ , #{isCredit}, #{cropCode}, #{categoryCode}, #{categoryName}, #{sourcePurpose}
+ , #{quantity}, #{unitCode}, #{price}, #{estimatedValue}
+ , now(), #{createdBy}, false
+ )
+
+
+
+ update daily_income set
+ updated_at = now()
+ , updated_by = #{updatedBy}
+ , is_credit = #{isCredit}
+ , crop_code = #{cropCode}
+ , category_code = #{categoryCode}
+ , category_name = #{categoryName}
+ , source_purpose = #{sourcePurpose}
+ , quantity = #{quantity}
+ , unit_code = #{unitCode}
+ , price = #{price}
+ , estimated_value = #{estimatedValue}
+ where is_deleted = false
+ and daily_record_seq = 1
+ and id = 1
+
+
+
+ update daily_income set
+ deleted_at = now(),
+ deleted_by = '_system',
+ is_deleted = true
+ where is_deleted = false
+ and daily_record_seq = 1
+ and id = 1
+
+
+
diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml
index 3269dc17..7083fb65 100644
--- a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml
+++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml
@@ -31,19 +31,19 @@
insert into daily_record (
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
+ , is_deleted
+ ,
) values (
#{householdSeq}
, #{recordMonth}, #{dayGroupNo}, #{startDate}, #{endDate}
, #{allStatus}, #{incomeStatus}, #{workStatus}, #{expenseStatus}, #{powerStatus}, #{forestryStatus}
- , now(), #{createdBy}, false
+ , false
+ ,
)
- update daily_record set
- updated_at = now()
- , updated_by = #{updatedBy}
+ update daily_record set
, all_status = #{allStatus}
diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties
index 64c57f5c..2a58bd68 100644
--- a/front/src/main/resources/messages/uri.properties
+++ b/front/src/main/resources/messages/uri.properties
@@ -8,4 +8,15 @@ uri.front.user.register=\uD68C\uC6D0\uAC00\uC785
uri.front.user.info=\uC815\uBCF4\uC218\uC815
uri.front.board.article.create=\uC608\uC81C \uAC8C\uC2DC\uD310 \uB4F1\uB85D
uri.front.board.article.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC0C1\uC138\uBCF4\uAE30
-uri.front.board.article.update.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC218\uC815
\ No newline at end of file
+uri.front.board.article.update.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC218\uC815
+
+# \uC77C\uACC4\uBD80
+uri.front.record.calendar=\uC77C\uACC4\uBD80 \uC6D4\uBCC4 \uD604\uD669
+uri.front.record.calendar.{{pathVar}}.{{pathVar}}=\uC77C\uACC4\uBD80 \uC6D4\uBCC4 \uD604\uD669
+uri.front.record.daily=\uC77C\uACC4\uBD80 \uB4F1\uB85D
+uri.front.record.daily.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D
+uri.front.record.income.{{pathVar}}=\uC218\uC785\uB0B4\uC5ED \uB4F1\uB85D
+uri.front.record.expense.{{pathVar}}=\uC9C0\uCD9C\uB0B4\uC5ED \uB4F1\uB85D
+uri.front.record.work.{{pathVar}}=\uB178\uB3D9\uC2DC\uAC04 \uB4F1\uB85D
+uri.front.record.power.{{pathVar}}=\uB3D9\uB825 \uC0AC\uC6A9\uC2DC\uAC04 \uB4F1\uB85D
+uri.front.record.forestry.{{pathVar}}=\uC790\uAC00\uC784\uC5C5 \uC0DD\uC0B0\uBB3C \uC911 \uC790\uAC00\uC18C\uBE44\uB7C9 \uB4F1\uB85D
diff --git a/front/src/main/resources/static/ui/ajaxUtil.js b/front/src/main/resources/static/ui/ajaxUtil.js
index 63327bae..0f44e93d 100644
--- a/front/src/main/resources/static/ui/ajaxUtil.js
+++ b/front/src/main/resources/static/ui/ajaxUtil.js
@@ -61,7 +61,7 @@ var ajaxUtil = {
uxgFn.popup.bind('.ui-popup-common-alert').open();
},
function(code, rstData) {
- research.logger.error('Do nothing. code: '+ code, rstData);
+ krs.logger.error('Do nothing. code: '+ code, rstData);
},
'html');
},
@@ -133,17 +133,16 @@ var ajaxUtil = {
if (typeof errorCallback !== 'undefined') {
errorCallback(ajaxUtil.$404, rstData);
} else {
- ajaxUtil._goToMain();
+ krs.move.main();
}
},
401:function(){
- ajaxUtil._goToMain();
+ krs.move.main();
},
403:function(rstData){
- ajaxUtil._goToMain();
+ krs.move.main();
},
422:function(rstData, status) {
- alert(422)
console.log(rstData)
$(rstData.responseJSON).each((idx, oj) => {
// TODO : form id? or body
@@ -203,7 +202,6 @@ var ajaxUtil = {
_jsonParse : function parse(jsonStr) {
try {
var jsonObj = JSON.parse(jsonStr);
- // chamobile.logger.debug(jsonObj);
return jsonObj;
} catch (error) {
console.error("Invalid JSON string:", error);
@@ -213,7 +211,6 @@ var ajaxUtil = {
_jsonStringify : function stringify(obj) {
try {
var jsonStr = JSON.stringify(obj);
- // chamobile.logger.debug(jsonStr);
return jsonStr;
} catch (error) {
console.error("Error stringifying object:", error);
diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js
index c4cc1ccc..4ac5594b 100644
--- a/front/src/main/resources/static/ui/commonUtil.js
+++ b/front/src/main/resources/static/ui/commonUtil.js
@@ -1,32 +1,39 @@
+let krs = {}; // KoreaReSearch
+krs.move = new Object;
+krs.logger = new Object();
+
+/* krs.move */
+/**
+ * 스크립트로 페이지 이동
+ */
+krs.move.main = function() {
+ location.href = '/';
+}
-var research = {};
-research.json = new Object();
-research.logger = new Object();
-
-/* research.logger */
+/* krs.logger */
/**
* client 오류성 로그 기록용 로거, 로그 레벨에 따라 표시
* @param message
* @param el
*/
-research.logger.debug = function(message, el){
- var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+krs.logger.debug = function(message, el){
+ let callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
console.log("[DEBUG] caller : " + callee + " / message : " + message, el);
};
-research.logger.error = function(message, el){
- var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+krs.logger.error = function(message, el){
+ let callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
console.error("[ERROR] caller : " + callee + " / message : " + message, el);
};
-research.logger.info = function(message){
- var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+krs.logger.info = function(message){
+ let callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
console.info("[INFO] caller : " + callee + " / message : " + message);
};
-research.logger.warn = function(message){
- var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
+krs.logger.warn = function(message){
+ let callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : '');
console.warn("[WARN] caller : " + callee + " / message : " + message);
};
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 6f53e9bc..34bd5ddb 100644
--- a/front/src/main/resources/static/ui/page/daily-record.js
+++ b/front/src/main/resources/static/ui/page/daily-record.js
@@ -1,30 +1,36 @@
-var page = {};
-page.daily = new Object();
+let krsp= {}; // KoreaReSearchPage
+krsp.daily = new Object();
-page.daily.httpUrl = {
- root: '/record/calendar',
- daily: '/record/daily/{searchMonth}/{groupNo}',
- income: '/record/income/{searchMonth}/{groupNo}',
- work: '/record/work/{searchMonth}/{groupNo}',
- expense: '/record/expense/{searchMonth}/{groupNo}',
- power: '/record/power/{searchMonth}/{groupNo}',
- forestry: '/record/forestry/{searchMonth}/{groupNo}',
+krsp.daily.httpUrl = {
+ base: '/record/calendar',
+ daily: '/record/daily/{month}/{groupNo}',
+ target: '/record/daily/{month}/{groupNo}/{target}',
+ // income: '/record/daily/{month}/{groupNo}/income',
+ // work: '/record/daily/{month}/{groupNo}/work',
+ // expense: '/record/daily/{month}/{groupNo}/expense',
+ // power: '/record/daily/{month}/{groupNo}/power',
+ // forestry: '/record/daily/{month}/{groupNo}/forestry',
+};
+
+krsp.daily.goToMain = function() {
+ location.href = krsp.daily.httpUrl.root;
+};
+
+krsp.daily.goToPrev = function(target, searchMonth, groupNo) {
+ let url = krsp.daily.httpUrl.target;
+ url = url.replace('{month}', searchMonth);
+ url = url.replace('{groupNo}', groupNo);
+ url = url.replace('{target}', target);
+
+ console.log(url);
}
-page.daily.goToMain = function() {
- location.href = page.daily.httpUrl.root;
-}
+krsp.daily.goToNext = function(target, searchMonth, groupNo) {
+ let url = krsp.daily.httpUrl.target;
+ url = url.replace('{month}', searchMonth);
+ url = url.replace('{groupNo}', groupNo);
+ url = url.replace('{target}', target);
-page.daily.goToNext = function(target, searchMonth, groupNo) {
- let url = page.daily.httpUrl.root;
-
- // TODO URL
- if (target == 'income') {
- url = page.daily.httpUrl.income;
- } else if (target == 'work') {
- url = page.daily.httpUrl.work;
- }
-
- console.log(url.replace('{searchMonth}', searchMonth).replace('{groupNo}', groupNo));
- //location.href = url.replace('{searchMonth}', searchMonth).replace('{groupNo}', groupNo);
-}
\ No newline at end of file
+ console.log(url);
+ //location.href = url;
+};
\ No newline at end of file
diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html
index ea541474..80d27611 100644
--- a/front/src/main/resources/templates/common/components.html
+++ b/front/src/main/resources/templates/common/components.html
@@ -84,6 +84,10 @@
Current Device : [[${currentDevice}]]
+
+ Current URI : [[${currentURI.id}]]
+
+
Current Login User :
@@ -91,6 +95,7 @@
로그인 사용자명
+ , seq=로그인 사용자SEQ
[로그아웃]
[정보수정]
diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html
index b89be442..d64c966c 100644
--- a/front/src/main/resources/templates/record/calendar.html
+++ b/front/src/main/resources/templates/record/calendar.html
@@ -53,7 +53,7 @@
$('#selectedDay').html(rstHtml);
},
function(code, rstData) {
- research.logger.error('Do nothing. code: '+ code, rstData);
+ krs.logger.error('Do nothing. code: '+ code, rstData);
},
'html'
);
diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily.html
index 2bf28cc2..6455eff6 100644
--- a/front/src/main/resources/templates/record/daily.html
+++ b/front/src/main/resources/templates/record/daily.html
@@ -48,6 +48,40 @@
+
+
@@ -79,9 +113,9 @@
console.log(rstData);
if (f.todayNone.value == 'Y') {
- page.daily.goToMain();
+ krsp.daily.goToMain();
} else {
- page.daily.goToNext($('input:checked').eq(0).data('target'), searchMonth, groupNo);
+ krsp.daily.goToNext($('input:checked').eq(0).data('target'), searchMonth, groupNo);
}
},
From 08ae6e1ada85f2eb47e5b8bdb094c8416e1fa529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?=
Date: Tue, 10 Jun 2025 11:23:41 +0900
Subject: [PATCH 5/8] =?UTF-8?q?[DB]=20NEW=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?=
=?UTF-8?q?DROP=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/sql/schema/01_drop-all.sql | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/core/src/main/resources/sql/schema/01_drop-all.sql b/core/src/main/resources/sql/schema/01_drop-all.sql
index eb239513..62afaf0f 100644
--- a/core/src/main/resources/sql/schema/01_drop-all.sql
+++ b/core/src/main/resources/sql/schema/01_drop-all.sql
@@ -13,6 +13,24 @@ DROP TABLE IF EXISTS researcher_has_household;
DROP TABLE IF EXISTS researcher_has_area;
DROP TABLE IF EXISTS research_area;
+-- NEW 일계부 연관 테이블(hj)
+DROP TABLE IF EXISTS daily_income;
+DROP TABLE IF EXISTS daily_expense;
+DROP TABLE IF EXISTS daily_work;
+DROP TABLE IF EXISTS daily_power;
+DROP TABLE IF EXISTS daily_forestry;
+DROP TABLE IF EXISTS daily_farming;
+DROP TABLE IF EXISTS daily_record;
+DROP TABLE IF EXISTS daily_day_group;
+
+DROP SEQUENCE IF EXISTS daily_income_seq;
+DROP SEQUENCE IF EXISTS daily_expense_seq;
+DROP SEQUENCE IF EXISTS daily_work_seq;
+DROP SEQUENCE IF EXISTS daily_power_seq;
+DROP SEQUENCE IF EXISTS daily_forestry_seq;
+DROP SEQUENCE IF EXISTS daily_farming_seq;
+DROP SEQUENCE IF EXISTS daily_record_seq;
+
-- household 연관 테이블
DROP TABLE IF EXISTS suggestion;
DROP TABLE IF EXISTS upload_receipt_files;
From d73167148ccf769000074ac1be81e5ed6a10fbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?=
Date: Tue, 10 Jun 2025 13:48:53 +0900
Subject: [PATCH 6/8] =?UTF-8?q?[FO]=20HTML=20=EB=A0=88=EC=9D=B4=EC=95=84?=
=?UTF-8?q?=EC=9B=83=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/.gitignore | 3 +
.../index/adapter/web/HomeController.java | 15 -
.../usecase/home/web/HomeController.java | 17 +
.../login/adapter/web/LoginController.java | 13 -
.../security/login/web/LoginController.java | 17 +
.../main/resources/messages/uri.properties | 4 +-
.../fonts/PretendardVariable.subset.0.woff2 | Bin 0 -> 62487 bytes
.../fonts/PretendardVariable.subset.1.woff2 | Bin 0 -> 57661 bytes
.../fonts/PretendardVariable.subset.10.woff2 | Bin 0 -> 59929 bytes
.../fonts/PretendardVariable.subset.11.woff2 | Bin 0 -> 67781 bytes
.../fonts/PretendardVariable.subset.12.woff2 | Bin 0 -> 68450 bytes
.../fonts/PretendardVariable.subset.13.woff2 | Bin 0 -> 64718 bytes
.../fonts/PretendardVariable.subset.14.woff2 | Bin 0 -> 66050 bytes
.../fonts/PretendardVariable.subset.15.woff2 | Bin 0 -> 64787 bytes
.../fonts/PretendardVariable.subset.16.woff2 | Bin 0 -> 68834 bytes
.../fonts/PretendardVariable.subset.17.woff2 | Bin 0 -> 63211 bytes
.../fonts/PretendardVariable.subset.18.woff2 | Bin 0 -> 75499 bytes
.../fonts/PretendardVariable.subset.19.woff2 | Bin 0 -> 76715 bytes
.../fonts/PretendardVariable.subset.2.woff2 | Bin 0 -> 80057 bytes
.../fonts/PretendardVariable.subset.20.woff2 | Bin 0 -> 65359 bytes
.../fonts/PretendardVariable.subset.21.woff2 | Bin 0 -> 67474 bytes
.../fonts/PretendardVariable.subset.22.woff2 | Bin 0 -> 69869 bytes
.../fonts/PretendardVariable.subset.23.woff2 | Bin 0 -> 73256 bytes
.../fonts/PretendardVariable.subset.24.woff2 | Bin 0 -> 58594 bytes
.../fonts/PretendardVariable.subset.25.woff2 | Bin 0 -> 76194 bytes
.../fonts/PretendardVariable.subset.26.woff2 | Bin 0 -> 73128 bytes
.../fonts/PretendardVariable.subset.27.woff2 | Bin 0 -> 63821 bytes
.../fonts/PretendardVariable.subset.28.woff2 | Bin 0 -> 69674 bytes
.../fonts/PretendardVariable.subset.29.woff2 | Bin 0 -> 71573 bytes
.../fonts/PretendardVariable.subset.3.woff2 | Bin 0 -> 73988 bytes
.../fonts/PretendardVariable.subset.30.woff2 | Bin 0 -> 69686 bytes
.../fonts/PretendardVariable.subset.31.woff2 | Bin 0 -> 76227 bytes
.../fonts/PretendardVariable.subset.32.woff2 | Bin 0 -> 72892 bytes
.../fonts/PretendardVariable.subset.33.woff2 | Bin 0 -> 63220 bytes
.../fonts/PretendardVariable.subset.34.woff2 | Bin 0 -> 62659 bytes
.../fonts/PretendardVariable.subset.35.woff2 | Bin 0 -> 64038 bytes
.../fonts/PretendardVariable.subset.36.woff2 | Bin 0 -> 62767 bytes
.../fonts/PretendardVariable.subset.37.woff2 | Bin 0 -> 50391 bytes
.../fonts/PretendardVariable.subset.38.woff2 | Bin 0 -> 63007 bytes
.../fonts/PretendardVariable.subset.39.woff2 | Bin 0 -> 62070 bytes
.../fonts/PretendardVariable.subset.4.woff2 | Bin 0 -> 63859 bytes
.../fonts/PretendardVariable.subset.40.woff2 | Bin 0 -> 53779 bytes
.../fonts/PretendardVariable.subset.41.woff2 | Bin 0 -> 60116 bytes
.../fonts/PretendardVariable.subset.42.woff2 | Bin 0 -> 62813 bytes
.../fonts/PretendardVariable.subset.43.woff2 | Bin 0 -> 55060 bytes
.../fonts/PretendardVariable.subset.44.woff2 | Bin 0 -> 58409 bytes
.../fonts/PretendardVariable.subset.45.woff2 | Bin 0 -> 62886 bytes
.../fonts/PretendardVariable.subset.46.woff2 | Bin 0 -> 66328 bytes
.../fonts/PretendardVariable.subset.47.woff2 | Bin 0 -> 64616 bytes
.../fonts/PretendardVariable.subset.48.woff2 | Bin 0 -> 68720 bytes
.../fonts/PretendardVariable.subset.49.woff2 | Bin 0 -> 65498 bytes
.../fonts/PretendardVariable.subset.5.woff2 | Bin 0 -> 60867 bytes
.../fonts/PretendardVariable.subset.50.woff2 | Bin 0 -> 60318 bytes
.../fonts/PretendardVariable.subset.51.woff2 | Bin 0 -> 65060 bytes
.../fonts/PretendardVariable.subset.52.woff2 | Bin 0 -> 62315 bytes
.../fonts/PretendardVariable.subset.53.woff2 | Bin 0 -> 62730 bytes
.../fonts/PretendardVariable.subset.54.woff2 | Bin 0 -> 60681 bytes
.../fonts/PretendardVariable.subset.55.woff2 | Bin 0 -> 62115 bytes
.../fonts/PretendardVariable.subset.56.woff2 | Bin 0 -> 63832 bytes
.../fonts/PretendardVariable.subset.57.woff2 | Bin 0 -> 65448 bytes
.../fonts/PretendardVariable.subset.58.woff2 | Bin 0 -> 75439 bytes
.../fonts/PretendardVariable.subset.59.woff2 | Bin 0 -> 70535 bytes
.../fonts/PretendardVariable.subset.6.woff2 | Bin 0 -> 61551 bytes
.../fonts/PretendardVariable.subset.60.woff2 | Bin 0 -> 68537 bytes
.../fonts/PretendardVariable.subset.61.woff2 | Bin 0 -> 64682 bytes
.../fonts/PretendardVariable.subset.62.woff2 | Bin 0 -> 63461 bytes
.../fonts/PretendardVariable.subset.63.woff2 | Bin 0 -> 51894 bytes
.../fonts/PretendardVariable.subset.64.woff2 | Bin 0 -> 14846 bytes
.../fonts/PretendardVariable.subset.65.woff2 | Bin 0 -> 20263 bytes
.../fonts/PretendardVariable.subset.66.woff2 | Bin 0 -> 14913 bytes
.../fonts/PretendardVariable.subset.67.woff2 | Bin 0 -> 39694 bytes
.../fonts/PretendardVariable.subset.68.woff2 | Bin 0 -> 29419 bytes
.../fonts/PretendardVariable.subset.69.woff2 | Bin 0 -> 63015 bytes
.../fonts/PretendardVariable.subset.7.woff2 | Bin 0 -> 57794 bytes
.../fonts/PretendardVariable.subset.70.woff2 | Bin 0 -> 50135 bytes
.../fonts/PretendardVariable.subset.71.woff2 | Bin 0 -> 51331 bytes
.../fonts/PretendardVariable.subset.72.woff2 | Bin 0 -> 35382 bytes
.../fonts/PretendardVariable.subset.73.woff2 | Bin 0 -> 33377 bytes
.../fonts/PretendardVariable.subset.74.woff2 | Bin 0 -> 40594 bytes
.../fonts/PretendardVariable.subset.75.woff2 | Bin 0 -> 36106 bytes
.../fonts/PretendardVariable.subset.76.woff2 | Bin 0 -> 45119 bytes
.../fonts/PretendardVariable.subset.77.woff2 | Bin 0 -> 47141 bytes
.../fonts/PretendardVariable.subset.78.woff2 | Bin 0 -> 47927 bytes
.../fonts/PretendardVariable.subset.79.woff2 | Bin 0 -> 47666 bytes
.../fonts/PretendardVariable.subset.8.woff2 | Bin 0 -> 66778 bytes
.../fonts/PretendardVariable.subset.80.woff2 | Bin 0 -> 51896 bytes
.../fonts/PretendardVariable.subset.81.woff2 | Bin 0 -> 47348 bytes
.../fonts/PretendardVariable.subset.82.woff2 | Bin 0 -> 48263 bytes
.../fonts/PretendardVariable.subset.83.woff2 | Bin 0 -> 48706 bytes
.../fonts/PretendardVariable.subset.84.woff2 | Bin 0 -> 44501 bytes
.../fonts/PretendardVariable.subset.85.woff2 | Bin 0 -> 45238 bytes
.../fonts/PretendardVariable.subset.86.woff2 | Bin 0 -> 46480 bytes
.../fonts/PretendardVariable.subset.87.woff2 | Bin 0 -> 44473 bytes
.../fonts/PretendardVariable.subset.88.woff2 | Bin 0 -> 46854 bytes
.../fonts/PretendardVariable.subset.89.woff2 | Bin 0 -> 39671 bytes
.../fonts/PretendardVariable.subset.9.woff2 | Bin 0 -> 61558 bytes
.../fonts/PretendardVariable.subset.90.woff2 | Bin 0 -> 37810 bytes
.../fonts/PretendardVariable.subset.91.woff2 | Bin 0 -> 68843 bytes
.../static/assets/images/acco/file_sample.png | Bin 0 -> 90395 bytes
.../assets/images/common/btn_allmenu.svg | 3 +
.../static/assets/images/common/btn_back.svg | 3 +
.../static/assets/images/common/btn_close.svg | 6 +
.../static/assets/images/common/ico_add.svg | 4 +
.../assets/images/common/ico_add_disabled.svg | 4 +
.../assets/images/common/ico_alert_blue.svg | 5 +
.../assets/images/common/ico_alert_green.svg | 4 +
.../images/common/ico_alert_lightgreen.svg | 4 +
.../assets/images/common/ico_alert_red.svg | 4 +
.../assets/images/common/ico_alert_yellow.svg | 4 +
.../assets/images/common/ico_arr_down.svg | 3 +
.../images/common/ico_arr_right_gray.svg | 3 +
.../assets/images/common/ico_arrow_.next.svg | 3 +
.../assets/images/common/ico_arrow_.prev.svg | 3 +
.../assets/images/common/ico_arrow_first.svg | 4 +
.../assets/images/common/ico_arrow_last.svg | 4 +
.../static/assets/images/common/ico_bank.svg | 3 +
.../assets/images/common/ico_btn_delete.svg | 12 +
.../assets/images/common/ico_calendar.svg | 6 +
.../assets/images/common/ico_calendar_bk.svg | 3 +
.../images/common/ico_calendar_white.svg | 3 +
.../static/assets/images/common/ico_chart.svg | 3 +
.../static/assets/images/common/ico_check.svg | 3 +
.../static/assets/images/common/ico_clear.svg | 5 +
.../assets/images/common/ico_delete.svg | 3 +
.../static/assets/images/common/ico_edit.svg | 3 +
.../static/assets/images/common/ico_hide.svg | 3 +
.../images/common/ico_location_green.svg | 3 +
.../assets/images/common/ico_menu_acco.svg | 10 +
.../images/common/ico_menu_acco_active.svg | 3 +
.../assets/images/common/ico_menu_home.svg | 10 +
.../images/common/ico_menu_home_active.svg | 3 +
.../assets/images/common/ico_menu_info.svg | 10 +
.../images/common/ico_menu_info_active.svg | 3 +
.../assets/images/common/ico_menu_regi.svg | 3 +
.../images/common/ico_menu_regi_active.svg | 10 +
.../assets/images/common/ico_menu_rept.svg | 6 +
.../images/common/ico_menu_rept_active.svg | 6 +
.../assets/images/common/ico_menu_stat.svg | 10 +
.../images/common/ico_menu_stat_active.svg | 3 +
.../assets/images/common/ico_notice.svg | 3 +
.../assets/images/common/ico_privacy.svg | 3 +
.../static/assets/images/common/ico_reset.svg | 3 +
.../assets/images/common/ico_search.svg | 4 +
.../static/assets/images/common/ico_show.svg | 3 +
.../static/assets/images/common/logo_kri.svg | 15 +
.../assets/images/info/info_card_back.png | Bin 0 -> 5575 bytes
.../resources/static/assets/scripts/common.js | 196 +
.../static/assets/scripts/common.locale.ko.js | 17 +
.../static/assets/scripts/common.ui.js | 6284 +++++++++++++++++
.../static/assets/scripts/common.ui.plugin.js | 701 ++
.../resources/static/assets/styles/style.css | 1 +
.../src/main/resources/static/ui/ajaxUtil.js | 8 +-
.../main/resources/static/ui/commonUtil.js | 26 +-
.../resources/static/ui/page/daily-record.js | 18 +-
.../templates/common/components.html | 268 +-
front/src/main/resources/templates/home.html | 16 -
.../templates/layout/layout-home.html | 19 -
.../templates/layout/layout-none.html | 23 +
.../resources/templates/layout/layout.html | 26 +-
.../resources/templates/record/calendar.html | 51 +-
.../resources/templates/record/daily.html | 16 +-
.../main/resources/templates/user/info.html | 7 +-
162 files changed, 7696 insertions(+), 269 deletions(-)
delete mode 100644 front/src/main/java/app/module/front/usecase/home/index/adapter/web/HomeController.java
create mode 100644 front/src/main/java/app/module/front/usecase/home/web/HomeController.java
delete mode 100644 front/src/main/java/app/module/front/usecase/security/login/adapter/web/LoginController.java
create mode 100644 front/src/main/java/app/module/front/usecase/security/login/web/LoginController.java
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.0.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.1.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.10.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.11.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.12.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.13.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.14.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.15.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.16.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.17.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.18.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.19.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.2.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.20.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.21.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.22.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.23.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.24.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.25.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.26.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.27.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.28.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.29.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.3.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.30.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.31.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.32.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.33.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.34.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.35.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.36.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.37.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.38.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.39.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.4.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.40.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.41.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.42.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.43.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.44.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.45.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.46.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.47.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.48.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.49.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.5.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.50.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.51.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.52.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.53.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.54.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.55.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.56.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.57.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.58.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.59.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.6.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.60.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.61.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.62.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.63.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.64.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.65.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.66.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.67.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.68.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.69.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.7.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.70.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.71.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.72.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.73.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.74.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.75.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.76.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.77.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.78.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.79.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.8.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.80.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.81.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.82.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.83.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.84.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.85.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.86.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.87.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.88.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.89.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.9.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.90.woff2
create mode 100644 front/src/main/resources/static/assets/fonts/PretendardVariable.subset.91.woff2
create mode 100644 front/src/main/resources/static/assets/images/acco/file_sample.png
create mode 100644 front/src/main/resources/static/assets/images/common/btn_allmenu.svg
create mode 100644 front/src/main/resources/static/assets/images/common/btn_back.svg
create mode 100644 front/src/main/resources/static/assets/images/common/btn_close.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_add.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_add_disabled.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_alert_blue.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_alert_green.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_alert_lightgreen.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_alert_red.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_alert_yellow.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_arr_down.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_arr_right_gray.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_arrow_.next.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_arrow_.prev.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_arrow_first.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_arrow_last.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_bank.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_btn_delete.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_calendar.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_calendar_bk.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_calendar_white.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_chart.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_check.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_clear.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_delete.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_edit.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_hide.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_location_green.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_acco.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_acco_active.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_home.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_home_active.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_info.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_info_active.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_regi.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_regi_active.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_rept.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_rept_active.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_stat.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_stat_active.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_notice.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_privacy.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_reset.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_search.svg
create mode 100644 front/src/main/resources/static/assets/images/common/ico_show.svg
create mode 100644 front/src/main/resources/static/assets/images/common/logo_kri.svg
create mode 100644 front/src/main/resources/static/assets/images/info/info_card_back.png
create mode 100644 front/src/main/resources/static/assets/scripts/common.js
create mode 100644 front/src/main/resources/static/assets/scripts/common.locale.ko.js
create mode 100644 front/src/main/resources/static/assets/scripts/common.ui.js
create mode 100644 front/src/main/resources/static/assets/scripts/common.ui.plugin.js
create mode 100644 front/src/main/resources/static/assets/styles/style.css
delete mode 100644 front/src/main/resources/templates/home.html
delete mode 100644 front/src/main/resources/templates/layout/layout-home.html
create mode 100644 front/src/main/resources/templates/layout/layout-none.html
diff --git a/front/.gitignore b/front/.gitignore
index 549e00a2..68f77a86 100644
--- a/front/.gitignore
+++ b/front/.gitignore
@@ -31,3 +31,6 @@ build/
### VS Code ###
.vscode/
+
+### Project
+**/resources/static/pages/**
\ No newline at end of file
diff --git a/front/src/main/java/app/module/front/usecase/home/index/adapter/web/HomeController.java b/front/src/main/java/app/module/front/usecase/home/index/adapter/web/HomeController.java
deleted file mode 100644
index 560f1861..00000000
--- a/front/src/main/java/app/module/front/usecase/home/index/adapter/web/HomeController.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package app.module.front.usecase.home.index.adapter.web;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-@RequiredArgsConstructor
-public class HomeController {
-
- @GetMapping(path = "/")
- public String home() {
- return "home";
- }
-}
diff --git a/front/src/main/java/app/module/front/usecase/home/web/HomeController.java b/front/src/main/java/app/module/front/usecase/home/web/HomeController.java
new file mode 100644
index 00000000..aa7f2c09
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/home/web/HomeController.java
@@ -0,0 +1,17 @@
+package app.module.front.usecase.home.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class HomeController {
+
+ /**
+ * FRONT 메인 페이지
+ * @return
+ */
+ @GetMapping(path = "/")
+ public String home() {
+ return "forward:/record/calendar";
+ }
+}
diff --git a/front/src/main/java/app/module/front/usecase/security/login/adapter/web/LoginController.java b/front/src/main/java/app/module/front/usecase/security/login/adapter/web/LoginController.java
deleted file mode 100644
index 74b23f43..00000000
--- a/front/src/main/java/app/module/front/usecase/security/login/adapter/web/LoginController.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package app.module.front.usecase.security.login.adapter.web;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class LoginController {
-
- @GetMapping("/login")
- public String login() {
- return "security/login";
- }
-}
diff --git a/front/src/main/java/app/module/front/usecase/security/login/web/LoginController.java b/front/src/main/java/app/module/front/usecase/security/login/web/LoginController.java
new file mode 100644
index 00000000..13744d45
--- /dev/null
+++ b/front/src/main/java/app/module/front/usecase/security/login/web/LoginController.java
@@ -0,0 +1,17 @@
+package app.module.front.usecase.security.login.web;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class LoginController {
+
+ /**
+ * FRONT 로그인 페이지
+ * @return
+ */
+ @GetMapping("/login")
+ public String login() {
+ return "security/login";
+ }
+}
diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties
index 2a58bd68..b6f5db92 100644
--- a/front/src/main/resources/messages/uri.properties
+++ b/front/src/main/resources/messages/uri.properties
@@ -1,5 +1,5 @@
uri=\uD648 \uD654\uBA74
-uri.front=\uBA54\uC778 \uD398\uC774\uC9C0
+uri.front=\uC784\uAC00\uACBD\uC81C\uC870\uC0AC
#uri.front.board.exampleBoard=\uC608\uC81C \uAC8C\uC2DC\uD310
uri.front.board.articles=\uC608\uC81C \uAC8C\uC2DC\uD310
uri.front.board.exampleBoard.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC0C1\uC138\uBCF4\uAE30
@@ -11,7 +11,7 @@ uri.front.board.article.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC0C1\uC138
uri.front.board.article.update.{{pathVar}}=\uC608\uC81C \uAC8C\uC2DC\uD310 \uC218\uC815
# \uC77C\uACC4\uBD80
-uri.front.record.calendar=\uC77C\uACC4\uBD80 \uC6D4\uBCC4 \uD604\uD669
+uri.front.record.calendar=\uC784\uAC00\uACBD\uC81C\uC870\uC0AC \uC77C\uACC4\uBD80
uri.front.record.calendar.{{pathVar}}.{{pathVar}}=\uC77C\uACC4\uBD80 \uC6D4\uBCC4 \uD604\uD669
uri.front.record.daily=\uC77C\uACC4\uBD80 \uB4F1\uB85D
uri.front.record.daily.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D
diff --git a/front/src/main/resources/static/assets/fonts/PretendardVariable.subset.0.woff2 b/front/src/main/resources/static/assets/fonts/PretendardVariable.subset.0.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..6325aeb3a375b8d769a1f0ae3035b4326576ea36
GIT binary patch
literal 62487
zcmaI92bX45wJuya=bYZkIp_RV&N=6tbIy?5*WPQdHPbGttKQmfu1YsEH^YDbdh_>oW^Pc-
zI}fxG3})ud0i3(>zW~gQ27&>hL10TZBgO3bFR1VSS4YrcWW1jymSS$$er1^MB1|yF9
zP^`U|5>vfb-0JMl8c;>oW!33u*&Z^Oz^Gc5(py
zlUw(gXMUZ!y|5=WZYm4Ip2{TeG~JwE0F}G2fBR>-HO*pYsDWY7G^hk*0jfx5PzBTN
zkRe4@c8rEaT4Z!%r9P)CdrXiF5R+nP8Em<~7+lb+yk>*p#2#39cz9?ibH>w+tM+$P
zbVTx?C7Bz}5I|vlJNH)4O&b+KaG`524=QJ3K-ca@gK_)7@wFcwK}3Sy|C!nW2LtQF
z$6S!-ZkRfziviBufJvH}qXJ&B7R52O>k~)mw3x0c{`6*yf&Cn2)lOvMN4L~NiK|=z
zFWBdmZE1!CYvyWrM@u+QP2Cm*(EstGg0qr=81^M#5aim!%=I)fvjn3M7k?5p*Wbib
z(wBlSUxF;0$qQd7U?lkf1`s&+1Cb}WDhn|=jhV7VEQk8F>qT^M94K-f>|oZ6o{t*K
z17A%AV~DdNw{LLb^aFcC5AO2oC_R)_&8?P-+%wc;t=GhT^M+1I608E4VIwo
zKnyiq+(s!G@ZQTJg)?@aKX=lSjltp9y7M3`OH4h6)Q`2j2ue^67^Q3HuKmP~?IZ)V
z00P>|hvJgXzSKrDut`UDD+h{+PGQXa#+9O-!>!CN%?So>A(aY`U8+q%xdBxXnPo6>
zrBgp@09Ou{%ch(6bDd4iT8ykG>QgDXo#wTZ#sSHj#^^K8+
zGxyO042YmEDXhCs)BzED#>COIFgYH#slC@3J%F8)CG7!PP#vL+egz8VZNnpv)FO3N
zuy98aEldM@kTnQUZGgK!_GsUQ7y+?fLRy%JCvohkkD{Q3>myy^VR=_2Xa&?mr;c@x
zg14A_=+R-)EhC%j*>inCKvUYG8N{yj)rZ88%fe#wVBzJ1=v}s2iU6=WP+}WXP+%&H
z4j2l$z
4S*#P3}R?m72K}_72wQk4x14B
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