From 1247be5ebfd8b3ac96f2539af032f727d8cf3661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 27 Jun 2025 13:58:24 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20AuditC?= =?UTF-8?q?ommand=20=EC=9E=90=EB=8F=99=20=EC=A3=BC=EC=9E=85=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/RemoveDailyDao.java | 2 ++ .../ports/application/RemoveDailyService.java | 8 +++----- .../adapters/persistence/UpdateDailyNoneDao.java | 2 ++ .../application/UpdateDailyNoneService.java | 16 +++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java index 87d7284e..f4627b87 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/adapters/persistence/RemoveDailyDao.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters. import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortOut; import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd; +import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.config.application.enums.DailySort; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -13,6 +14,7 @@ import org.springframework.stereotype.Repository; public class RemoveDailyDao implements RemoveDailyPortOut { private final RemoveDailyMapper mapper; + @UpdateCommand @Override public void operate(RemoveDailyCmd command) { if (command.getCurrentStep() != null) { diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java index 2a2a1337..22289303 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/removeDaily/ports/application/RemoveDailyService.java @@ -15,11 +15,9 @@ public class RemoveDailyService implements RemoveDailyPortIn { @Override public void operate(RemoveDailyReqVO reqVO) { - RemoveDailyCmd command = AuditUtil.update( - new RemoveDailyCmd( - reqVO.getSelectedIds(), - reqVO.getCurrentStep()) - ); + RemoveDailyCmd command = new RemoveDailyCmd( + reqVO.getSelectedIds(), + reqVO.getCurrentStep()); portOut.operate(command); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java index 4eccef83..46d5ccd1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/adapters/persistence/UpdateDailyNoneDao.java @@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapt import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortOut; import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd; +import app.module.core.config.application.annotation.UpdateCommand; import app.module.core.config.application.enums.DailySort; import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; @@ -16,6 +17,7 @@ class UpdateDailyNoneDao implements UpdateDailyNonePortOut { private final UpdateDailyNoneMapper mapper; private final DailyRecordPortIn dailyRecordPortIn; + @UpdateCommand @Override public void create(UpdateDailyNoneCmd command) { command.setDailyRecordSeq(mapper.getDailyRecordSeq(command)); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java index f8a953fa..cf61d2e2 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/updateDailyNone/ports/application/UpdateDailyNoneService.java @@ -18,15 +18,13 @@ public class UpdateDailyNoneService implements UpdateDailyNonePortIn { public void create(UpdateDailyNoneReqVO formVO) { DailyTargetStatus currentStatus = "Y".equals(formVO.getTodayNone()) ? DailyTargetStatus.TODAY_NONE : DailyTargetStatus.TARGET; - UpdateDailyNoneCmd command = AuditUtil.update( - new UpdateDailyNoneCmd( - formVO.getRecordMonth(), - formVO.getGroupNo(), - formVO.getHouseholdSeq(), - formVO.getCurrentStep(), - currentStatus, - null) - ); + UpdateDailyNoneCmd command = new UpdateDailyNoneCmd( + formVO.getRecordMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getCurrentStep(), + currentStatus, + null); portOut.create(command); } From cad36bec9342671d693780a81c6bd16304b40c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 27 Jun 2025 15:04:32 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20-=20?= =?UTF-8?q?=EB=86=8D=EC=97=85=20=EC=83=9D=EC=82=B0=EB=AC=BC=20=ED=8F=AC?= =?UTF-8?q?=EC=BB=A4=EC=8A=A4=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/templates/record/farming/form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/main/resources/templates/record/farming/form.html b/front/src/main/resources/templates/record/farming/form.html index ea11e632..88612880 100644 --- a/front/src/main/resources/templates/record/farming/form.html +++ b/front/src/main/resources/templates/record/farming/form.html @@ -16,7 +16,7 @@

- + From 6c7fc435add39cbc1f9cb75e2980308c5c5cb7db Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Fri, 27 Jun 2025 15:04:48 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[FO]=20=EC=88=98=EC=A0=95=20:=2052.=20?= =?UTF-8?q?=ED=95=84=EC=88=98=20=EC=9E=85=EB=A0=A5=20=EC=82=AC=ED=95=AD?= =?UTF-8?q?=EC=9D=84=20=EC=9E=85=EB=A0=A5=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EC=9D=80=20=EA=B2=BD=EC=9A=B0,=20=EC=9E=85=EB=A0=A5=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EB=9E=80=EC=9D=84=20=ED=8F=AC?= =?UTF-8?q?=EC=BB=A4=EC=8A=A4=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/static/ui/commonUtil.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index 6506dcfe..a3051b5b 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -172,7 +172,7 @@ kri.form.errorInit = function (formElement) { if (formElement.length > 0) { $(formElement).find('.component-input').removeClass('input-invalid'); $(formElement).find('.input-flex-group').removeClass('invalid'); - $(formElement).find('.select-group').removeClass('select-invalid'); + $(formElement).find('.select-group').removeClass('input-invalid'); $(formElement).find('.input-info').each(function () { $(this).remove(); }); @@ -238,11 +238,12 @@ kri.form.error = function(errorList){ } }); - if(errorList && errorList.length > 0){ - const target = $('[name="' + errorList[0].field + '"]'); - if (target.length > 0) { - target.focus(); - } + // 포커스 이동 + if ($('.input-invalid').length != 0) { + $('.input-invalid').eq(0).find('input').focus(); + } + if ($('.select-invalid').length != 0) { + $('.select-invalid').eq(0).find('button').focus(); } } From 6ac3d6302356ca2b63ce7d58c48bb70f6784fc87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 27 Jun 2025 15:08:10 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[HTML]=20=EC=88=98=EC=A0=95=20::=20?= =?UTF-8?q?=ED=91=B8=ED=84=B0=20=EB=A9=94=EB=89=B4(=EC=95=B1=EB=B0=94)=20>?= =?UTF-8?q?=20=ED=86=B5=EA=B3=84=20=EB=A9=94=EB=89=B4=20=EC=A3=BC=EC=84=9D?= =?UTF-8?q?=20=EB=B0=8F=20=EC=9D=B4=EC=9A=A9=EC=95=88=EB=82=B4=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/images/common/ico_menu_use.svg | 3 +++ .../assets/images/common/ico_menu_use_active.svg | 3 +++ .../assets/images/common/ico_menu_use_disabled.svg | 3 +++ .../src/main/resources/static/assets/styles/style.css | 11 ++++++++++- .../main/resources/templates/common/components.html | 2 +- 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_use.svg create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_use_active.svg create mode 100644 front/src/main/resources/static/assets/images/common/ico_menu_use_disabled.svg diff --git a/front/src/main/resources/static/assets/images/common/ico_menu_use.svg b/front/src/main/resources/static/assets/images/common/ico_menu_use.svg new file mode 100644 index 00000000..1ec9d628 --- /dev/null +++ b/front/src/main/resources/static/assets/images/common/ico_menu_use.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/main/resources/static/assets/images/common/ico_menu_use_active.svg b/front/src/main/resources/static/assets/images/common/ico_menu_use_active.svg new file mode 100644 index 00000000..22bb758b --- /dev/null +++ b/front/src/main/resources/static/assets/images/common/ico_menu_use_active.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/main/resources/static/assets/images/common/ico_menu_use_disabled.svg b/front/src/main/resources/static/assets/images/common/ico_menu_use_disabled.svg new file mode 100644 index 00000000..fbeaa05e --- /dev/null +++ b/front/src/main/resources/static/assets/images/common/ico_menu_use_disabled.svg @@ -0,0 +1,3 @@ + + + diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index bf4048d0..c23ced15 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -6265,7 +6265,6 @@ button.swiper-pagination-bullet { background-color: #ffffff; width: 100%; position: absolute; - background-color: #eeeeee; border: 1px solid #cccccc; } @media screen and (max-width: 1023px) { @@ -6321,6 +6320,7 @@ button.swiper-pagination-bullet { .component-select.bottom-sheet .select-options .option.current { font-weight: 600; color: #4bbc43; + background-color: #F9FDF9; } /* component tab */ @@ -7731,6 +7731,15 @@ button.swiper-pagination-bullet { .footer .footer-menu ul li.menu-info.active { background-image: url("../images/common/ico_menu_info_active.svg"); } +.footer .footer-menu ul li.menu-use { + background-image: url("../images/common/ico_menu_use.svg"); +} +.footer .footer-menu ul li.menu-use.active { + background-image: url("../images/common/ico_menu_use_active.svg"); +} +.footer .footer-menu ul li.menu-use.disabled { + background-image: url("../images/common/ico_menu_use_disabled.svg"); +} .footer .footer-menu ul li.active a { color: #4bbc43; } diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index d58f61bc..9e5e5eb1 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -167,7 +167,7 @@ - +