From ad746c0136d40b455e04a73aebed3beb05959053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Wed, 25 Jun 2025 11:18:47 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=EC=83=81=ED=83=9C=EC=97=90=20=EB=94=B0=EB=A5=B8=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20HTML=20=EC=A0=81=EC=9A=A9,=20=EB=8B=A4?= =?UTF-8?q?=EC=9D=8C=EB=8B=A8=EA=B3=84=EB=A1=9C=20=EC=9D=B4=EB=8F=99=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/RecordCalendarDao.java | 2 +- .../resources/static/assets/styles/style.css | 26 +++++++- .../resources/templates/record/calendar.html | 64 ++++++++----------- 3 files changed, 51 insertions(+), 41 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java index 0c811c4f..bb2af56a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java @@ -77,7 +77,7 @@ public class RecordCalendarDao implements RecordCalendarPortOut { } } else { - if (!DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus())) { + if (!DailyTargetStatus.NONE.equals(findStatus.getIncomeStatus())) { childList.add(new CalendarChildren( DailySort.INCOME.name(), DailySort.INCOME.getDesc(), diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index 067136c6..bd5932c6 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -8511,6 +8511,7 @@ button.swiper-pagination-bullet { font-size: 1.6rem; line-height: 140%; color: #868e96; + word-break: break-all; } .regist-item-area .item-list .list-item .detail-list li p::before { position: absolute; @@ -8523,7 +8524,8 @@ button.swiper-pagination-bullet { line-height: 140%; } .regist-item-area .item-list .list-item .detail-list li span { - max-width: 80%; + min-width: 40%; + word-break: break-all; color: #212529; } @@ -8667,13 +8669,20 @@ button.swiper-pagination-bullet { color: #ffffff; } -.btn-column-list li a { +.btn-column-list li { position: relative; display: block; padding: 2rem 1.6rem; background-color: #ffffff; border-radius: 0.8rem; - box-shadow: 0px 1px 8px -2px rgba(16, 24, 40, 0.05); + box-shadow: 0px 1px 4px -2px rgba(16, 24, 40, 0.04), 0px 1px 8px -2px rgba(16, 24, 40, 0.05); +} +.btn-column-list li a { + position: relative; + padding: 2rem 5.2rem 2rem 1.6rem; + display: block; + width: 100%; + height: 100%; } .btn-column-list li a::before { position: absolute; @@ -8685,8 +8694,19 @@ button.swiper-pagination-bullet { -webkit-transform: translateY(-50%); transform: translateY(-50%); right: 2rem; +} +.btn-column-list li.edit { + padding: 0; +} +.btn-column-list li.edit a::before { background: url("../images/common/ico_edit.svg") center/contain no-repeat; } +.btn-column-list li.view { + padding: 0; +} +.btn-column-list li.view a::before { + background: url("../images/common/ico_arr_right_gray.svg") center/contain no-repeat; +} .btn-column-list li .label { font-size: 2rem; line-height: 140%; diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 7ee5c70b..6b045e1f 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -818,11 +818,33 @@ {{include tmpl="#titleTmpl" /}} {{include tmpl="#etcRowTmpl" /}} @@ -834,38 +856,6 @@

{{:date.start}} ~ {{:date.end}}

{{/if}} - -