diff --git a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml index 69de936e..aa5c6a08 100644 --- a/core/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/core/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -145,7 +145,7 @@ AND dr.day_group_no = g.day_group_no LEFT JOIN daily_day_group ddg ON ddg.group_no = g.day_group_no - WHERE dr.all_status != 'DONE' OR dr.id is null + WHERE dr.all_status not in('DONE','TODAY_NONE') OR dr.id is null ORDER BY g.day_group_no diff --git a/front/src/main/resources/templates/info/main.html b/front/src/main/resources/templates/info/main.html index 83bf0bdb..f403b3fd 100644 --- a/front/src/main/resources/templates/info/main.html +++ b/front/src/main/resources/templates/info/main.html @@ -43,10 +43,10 @@ - -

공지사항

-

-
+
+ 공지사항 + +
공지사항 diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 05376d13..2a009f97 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -820,7 +820,7 @@ // 오늘 날짜가 해당 달의 마지막 날인지 확인 const today = new Date(); //const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0); // 해당 달의 마지막 날 - const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 21); // TODO 삭제 테스트를 위해 22일로 수정 + const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth(), 22); // TODO 삭제 테스트를 위해 22일로 수정 // 마지막 alert 날짜 확인 const lastAlertDate = sessionStorage.getItem('lastAlertDate'); const todayDateString = today.toDateString();