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 index 8d0740ea..8f12fa66 100644 --- 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 @@ -13,32 +13,19 @@ import java.util.List; @Mapper public interface RecordCalendarMapper { - List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO); + /** + * 특정월의 일 그룹 목록 조회 + * + * @param reqVO 검색 조건 + * @return 특정월의 그룹 목록 + */ + 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); + /** + * 특정일의 일계부 등록 상태 조회 + * + * @param reqVO 검색 조건 + * @return 일계부 등록 현황 목록 + */ + List getDailyRecordStatus(RecordCalendarUIReqVO reqVO); } 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 index bfdd0b1f..82ae33c0 100644 --- 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 @@ -6,9 +6,9 @@ import lombok.Setter; @Getter @Setter public class DailyRecordCalendarDto { - private String groupNo; + private Integer groupNo; private Integer startDay; private Integer endDay; private String startDate; - private String dailyId; + private Long 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 index fc13c0b2..8ba3c703 100644 --- 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 @@ -1,5 +1,8 @@ package app.module.front.usecase.daily.calendar.persistence.model; +import app.module.front.usecase.daily.record.web.model.DailyStatus; +import app.module.front.usecase.daily.record.web.model.DailyTargetStatus; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.ToString; @@ -8,22 +11,72 @@ 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; + /** + * 일계부 일련번호 + */ + private Long dailyId; + /** + * 특정일의 그룹 번호 + */ + private Integer dayGroupNo; + /** + * 시작일 + */ + private LocalDate startDate; + /** + * 종료일 + */ + private LocalDate endDate; + /** + * 특정일 입력 상태 + */ + private DailyStatus allStatus; + /** + * 수입 입력 상태 + */ + private DailyTargetStatus incomeStatus; + /** + * 임업노동 입력 상태 + */ + private DailyTargetStatus workStatus; + /** + * 지출 입력 상태 + */ + private DailyTargetStatus expenseStatus; + /** + * 동력 사용시간 입력 상태 + */ + private DailyTargetStatus powerStatus; + /** + * 자가임업 입력 상태 + */ + private DailyTargetStatus forestryStatus; + /** + * 자가농업 입력 상태 + */ + private DailyTargetStatus farmingStatus; + /** + * 수입 입력 개수 + */ + private Integer incomeCount; + /** + * 임업노동 입력 개수 + */ + private Integer workCount; + /** + * 지출 입력 개수 + */ + private Integer expenseCount; + /** + * 동력 사용시간 입력 개수 + */ + private Integer powerCount; + /** + * 자가임업 입력 개수 + */ + private Integer forestryCount; + /** + * 자가농업 입력 개수 + */ + private Integer farmingCount; } 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 index 0d528374..ad3ca5bf 100644 --- 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 @@ -1,16 +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 app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIResVO; import java.util.List; public interface RecordCalendarService { - List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO); - - DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO); - - int getStartDayByDailyGroupNo(RecordCalendarUIReqVO reqVO); + /** + * 특정월의 일계부 현황 조회 + * + * @param reqVO 검색 조건 + * @return 월별 일계부 목록 + */ + List getCalendarByDailyRecord(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 index 22cb9bbb..22522920 100644 --- 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 @@ -3,52 +3,138 @@ 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.RecordCalendarChildrenVO; import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; +import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIResVO; import app.module.front.usecase.daily.record.persistence.DailyRecordMapper; +import app.module.front.usecase.daily.record.web.model.DailyTargetStatus; 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; +import java.util.*; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor public class RecordCalendarServiceImpl implements RecordCalendarService { - private final RecordCalendarMapper recordCalendarMapper; + private final RecordCalendarMapper recordCalendarMapper; - @Override - public List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO) { - int lastDay = reqVO.getSearchDate().withDayOfMonth(reqVO.getSearchDate().lengthOfMonth()).getDayOfMonth(); + @Override + public List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO) { + List calendarList = this.getCalendarList(reqVO); + List statusList = this.getDailyRecordStatus(reqVO); - List list = recordCalendarMapper.getCalendarByDailyRecord(reqVO); + String pathFormat = "/record/%s/%s/%s"; - List refineList = new ArrayList(); - for (DailyRecordCalendarDto record : list) { - record.setStartDate(reqVO.getSearchMonth() + String.format("%02d", record.getStartDay())); + List refineList = new ArrayList<>(); + for (DailyRecordCalendarDto calendar : calendarList) { + RecordCalendarUIResVO refine = new RecordCalendarUIResVO(); + refine.setNo(calendar.getGroupNo()); + refine.setStart(calendar.getStartDay()); + refine.setEnd(calendar.getEndDay()); - 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); - } + DailyRecordStatusDto findStatus = statusList.stream() + .filter(f -> Objects.equals(calendar.getDailyId(), f.getDailyId())) + .findFirst().orElse(null); + + if (findStatus == null) { + refine.setChildren(new ArrayList<>()); + } else { + List childList = new ArrayList<>(); + + if (DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus())) { + childList.add(new RecordCalendarChildrenVO( + "INCOME", + "수입", + findStatus.getIncomeCount(), + String.format(pathFormat, "income", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + } + if (DailyTargetStatus.TARGET.equals(findStatus.getWorkStatus())) { + childList.add(new RecordCalendarChildrenVO( + "WORK", + "임업노동 투입 내역", + findStatus.getWorkCount(), + String.format(pathFormat, "work", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + } + if (DailyTargetStatus.TARGET.equals(findStatus.getExpenseStatus())) { + childList.add(new RecordCalendarChildrenVO( + "EXPENSE", + "지출", + findStatus.getExpenseCount(), + String.format(pathFormat, "expense", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + } + if (DailyTargetStatus.TARGET.equals(findStatus.getPowerStatus())) { + childList.add(new RecordCalendarChildrenVO( + "POWER", + "동력 사용시간", + findStatus.getPowerCount(), + String.format(pathFormat, "power", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + } + if (DailyTargetStatus.TARGET.equals(findStatus.getForestryStatus())) { + childList.add(new RecordCalendarChildrenVO( + "FORESTRY", + "자가임업 생산물 중 자가소비량", + findStatus.getForestryCount(), + String.format(pathFormat, "forestry", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + } + if (DailyTargetStatus.TARGET.equals(findStatus.getFarmingStatus())) { + childList.add(new RecordCalendarChildrenVO( + "FARMING", + "자가농업 생산물 중 자가소비량", + findStatus.getFarmingCount(), + String.format(pathFormat, "farming", reqVO.getSearchMonth(), findStatus.getDayGroupNo()))); + } + + refine.setChildren(childList); + } + + refineList.add(refine); + } + + return refineList; } - return refineList; - } + /** + * 특정월의 일 그룹 조회 + * + * @param reqVO + * @return + */ + private List getCalendarList(RecordCalendarUIReqVO reqVO) { + int lastDay = reqVO.getSearchDate().withDayOfMonth(reqVO.getSearchDate().lengthOfMonth()).getDayOfMonth(); - @Override - public DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO) { - return recordCalendarMapper.getDailyRecordStatus(reqVO); - } + List calendarList = recordCalendarMapper.getCalendarByDailyRecord(reqVO); - @Override - public int getStartDayByDailyGroupNo(RecordCalendarUIReqVO reqVO) { - return recordCalendarMapper.getStartDayByDailyGroupNo(reqVO.getGroupNo()); - } + List refineList = new ArrayList<>(); + for (DailyRecordCalendarDto record : calendarList) { + 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; + } + + /** + * 특정월의 일계부 등록 상태 조회 + * + * @param reqVO + * @return + */ + private List getDailyRecordStatus(RecordCalendarUIReqVO reqVO) { + List statusList = recordCalendarMapper.getDailyRecordStatus(reqVO); + if (statusList == null || statusList.isEmpty()) { + return Collections.emptyList(); + } + + return statusList; + } } 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 index e546c3c4..6f757473 100644 --- 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 @@ -3,7 +3,9 @@ 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.RecordCalendarChildrenVO; import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; +import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIResVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import java.time.LocalDate; import java.time.YearMonth; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.List; @Slf4j @@ -21,46 +24,16 @@ import java.util.List; @RequiredArgsConstructor @RequestMapping(path = "/record/calendar") public class RecordCalendarController { - private final RecordCalendarService recordCalendarService; + 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); + @GetMapping(path = "") + public String index(Model model, @RequestParam(value = "searchDay", required = false) String searchDay) { + RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchDay); + log.debug("reqVO: {}", reqVO); - model.addAttribute("reqVO", reqVO); - model.addAttribute("calendarList", recordCalendarService.getCalendarByDailyRecord(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)); + return "record/calendar"; } - - //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/RecordCalendarChildrenVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarChildrenVO.java new file mode 100644 index 00000000..8bdaa194 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarChildrenVO.java @@ -0,0 +1,19 @@ +package app.module.front.usecase.daily.calendar.web.model; + +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.ToString; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +@Data +@AllArgsConstructor +public class RecordCalendarChildrenVO { + private String code; + private String codeLabel; + private Integer total; + private String path; +} 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 index 2d1c1b5e..7892778f 100644 --- 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 @@ -1,8 +1,7 @@ package app.module.front.usecase.daily.calendar.web.model; +import app.module.front.usecase.daily.record.web.model.DailyUIReqVO; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import lombok.ToString; import org.apache.tika.utils.StringUtils; import org.slf4j.Logger; @@ -10,64 +9,48 @@ 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 class RecordCalendarUIReqVO extends DailyUIReqVO { + 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")); + public RecordCalendarUIReqVO() { } - try { - SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); - SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); - SimpleDateFormat monthSdf = new SimpleDateFormat("yyyyMM", Locale.KOREAN); + public RecordCalendarUIReqVO(String searchDay) { + if (StringUtils.isBlank(searchDay) || searchDay.length() != 8) { + searchDay = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); + } - Date formatDate = beforeSdf.parse(searchDay); + try { + SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); + SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); + SimpleDateFormat monthSdf = new SimpleDateFormat("yyyyMM", Locale.KOREAN); - setSearchDate(LocalDate.parse(afterSdf.format(formatDate))); - setSearchMonth(monthSdf.format(formatDate)); - setSearchDay(beforeSdf.format(formatDate)); + Date formatDate = beforeSdf.parse(searchDay); - } catch (Exception e) { - LOGGER.warn("[DateParse] target={}", searchDay, e); + 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; - /** - * 검색 일(yyyyMMdd) - */ - private String searchDay; - - /** - * 검색 월(yyyyMM) - */ - private String searchMonth; - private Integer groupNo; - - /** - * 검색 일(yyyy-MM-dd) - */ - private LocalDate searchDate; - - /** - * 임가회원 일련번호 - */ - private Long householdSeq; + /** + * 검색 일(yyyy-MM-dd) + */ + private LocalDate searchDate; } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIResVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIResVO.java new file mode 100644 index 00000000..ce2fe7d2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIResVO.java @@ -0,0 +1,19 @@ +package app.module.front.usecase.daily.calendar.web.model; + +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; +import lombok.Data; +import lombok.ToString; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +@Data +@ToString +public class RecordCalendarUIResVO { + private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIResVO.class); + private Integer no; + private Integer start; + private Integer end; + private List children; +} diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index d985da83..10216e64 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -19,43 +19,27 @@ - - - - - - /* 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/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 50fe530a..d8502891 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -3,21 +3,25 @@ xmlns:th="http://www.thymeleaf.org" lang="ko">
-
-

calendar

+
reqVO: [[${reqVO}]]
- - - No=[[${calendar.groupNo}]], Start=[[${calendar.startDay}]], End=[[${calendar.endDay}]], StartDate=[[${calendar.startDate}]], Id=[[${calendar.dailyId}]]
+ + + No=[[${calendar.no}]], Start=[[${calendar.start}]], End=[[${calendar.end}]], children=[[${calendar.children}]]
+ + + >> Text=[[${children.codeLabel}]], Path=[[${children.path}]], Count=[[${children.total}]]
+
+
- - - No=[[${calendar.groupNo}]], Start=[[${calendar.startDay}]], End=[[${calendar.endDay}]], StartDate=[[${calendar.startDate}]]
+ + + No=[[${calendar.no}]], Start=[[${calendar.start}]], End=[[${calendar.end}]]
@@ -28,6 +32,484 @@
+
+
+ + + + + +
+
+ +
+ +
+ +
+ +
+