From 0460078d8f329410e9ca848bbd77dc81b4dbcc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Thu, 17 Jul 2025 14:56:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=97=91=EC=85=80=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20/=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20/=20?= =?UTF-8?q?=EB=8C=80=EC=89=AC=EB=B3=B4=EB=93=9C=ED=92=80=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/admin/adminList.html | 2 +- admin/src/main/resources/templates/home.html | 8 ++++---- .../main/resources/templates/households/households.html | 6 +++--- .../main/resources/templates/researcher/researchers.html | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/admin/src/main/resources/templates/admin/adminList.html b/admin/src/main/resources/templates/admin/adminList.html index 0eeccb8a..13ff4a31 100644 --- a/admin/src/main/resources/templates/admin/adminList.html +++ b/admin/src/main/resources/templates/admin/adminList.html @@ -128,7 +128,7 @@
- diff --git a/admin/src/main/resources/templates/home.html b/admin/src/main/resources/templates/home.html index fb321878..f3795650 100644 --- a/admin/src/main/resources/templates/home.html +++ b/admin/src/main/resources/templates/home.html @@ -4,7 +4,7 @@ xmlns:sec="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"> -
+

@@ -405,9 +405,9 @@ const activeProfile = '[[${activeProfile}]]'; // 페이지 로드 시 호출 $(document).ready(function() { - if(activeProfile === 'local'){ - getTotalPercentage(); - } + + getTotalPercentage(); + $('#usageType').change(function() { getTotalPercentage(); }); diff --git a/admin/src/main/resources/templates/households/households.html b/admin/src/main/resources/templates/households/households.html index df290145..aca3a836 100644 --- a/admin/src/main/resources/templates/households/households.html +++ b/admin/src/main/resources/templates/households/households.html @@ -270,10 +270,10 @@
- - diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html index 9b265fe6..fe11154d 100644 --- a/admin/src/main/resources/templates/researcher/researchers.html +++ b/admin/src/main/resources/templates/researcher/researchers.html @@ -95,7 +95,7 @@
-
+

diff --git a/front/src/main/resources/templates/record/farming/index.html b/front/src/main/resources/templates/record/farming/index.html index b9ed6a39..775fee32 100644 --- a/front/src/main/resources/templates/record/farming/index.html +++ b/front/src/main/resources/templates/record/farming/index.html @@ -36,7 +36,8 @@ + th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}" + onchange="modalControl.showTodayNoneAlert(this)"> 금일 등록내용 없음 @@ -216,6 +217,23 @@ }, ); }, + showTodayNoneAlert(checkbox){ + if (checkbox.checked) { + etUI.dialog.alert({ + message: '금일 등록내용 없음을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + }else{ + etUI.dialog.alert({ + message: '등록을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + } + }, };
diff --git a/front/src/main/resources/templates/record/forestry/index.html b/front/src/main/resources/templates/record/forestry/index.html index 8324c0ba..ae4a60d0 100644 --- a/front/src/main/resources/templates/record/forestry/index.html +++ b/front/src/main/resources/templates/record/forestry/index.html @@ -36,7 +36,8 @@ + th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}" + onchange="modalControl.showTodayNoneAlert(this)"> 금일 등록내용 없음 @@ -204,6 +205,23 @@ }, ); }, + showTodayNoneAlert(checkbox){ + if (checkbox.checked) { + etUI.dialog.alert({ + message: '금일 등록내용 없음을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + }else{ + etUI.dialog.alert({ + message: '등록을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + } + }, }; diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index 98e2792b..4baa9800 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -45,7 +45,8 @@ + th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}" + onchange="modalControl.showTodayNoneAlert(this)"> 금일 등록내용 없음 @@ -525,7 +526,23 @@ ajaxUtil._hideWaiting(); }, - + showTodayNoneAlert(checkbox){ + if (checkbox.checked) { + etUI.dialog.alert({ + message: '금일 등록내용 없음을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + }else{ + etUI.dialog.alert({ + message: '등록을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + } + }, }; diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index bd07d638..58c293d5 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -36,7 +36,8 @@ + th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}" + onchange="modalControl.showTodayNoneAlert(this)"> 금일 등록내용 없음 @@ -205,6 +206,23 @@ }, ); }, + showTodayNoneAlert(checkbox){ + if (checkbox.checked) { + etUI.dialog.alert({ + message: '금일 등록내용 없음을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + }else{ + etUI.dialog.alert({ + message: '등록을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + } + }, }; diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index cb20f194..cbe70a52 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -36,7 +36,8 @@ + th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}" + onchange="modalControl.showTodayNoneAlert(this)"> 금일 등록내용 없음 @@ -266,6 +267,23 @@ } ); }, + showTodayNoneAlert(checkbox){ + if (checkbox.checked) { + etUI.dialog.alert({ + message: '금일 등록내용 없음을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + }else{ + etUI.dialog.alert({ + message: '등록을 선택하셨습니다.', + type: 'alert', + callback: function () { + }, + }); + } + }, }; From f72a9241644631fed5aaab29a5a4e5e6162accff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Thu, 17 Jul 2025 15:38:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/model/LocalRegionResearcherPercentDto.java | 1 + admin/src/main/resources/mappers/dashboard/ChartMapper.xml | 1 + admin/src/main/resources/templates/home.html | 4 ++-- admin/src/main/resources/templates/researcher/detail.html | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/LocalRegionResearcherPercentDto.java b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/LocalRegionResearcherPercentDto.java index 60754028..0c19d60b 100644 --- a/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/LocalRegionResearcherPercentDto.java +++ b/admin/src/main/java/app/module/admin/usecase/dashboard/chart/adapters/persistence/model/LocalRegionResearcherPercentDto.java @@ -4,6 +4,7 @@ import lombok.Data; @Data public class LocalRegionResearcherPercentDto { + private Long seq; private String researcherName; private String regionMainCodeName; private Double totalHouseholdCount; diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 4abfbd25..5a8c0bc2 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -81,6 +81,7 @@ -
+