diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index 27207001..5a477137 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -51,7 +51,7 @@ public class AdminUtil { } AdminUser user = (AdminUser) authentication.getPrincipal(); - return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode(); + return user.getRegionMainCode() == null ? null : user.getRegionMainCode(); } public static String getLoginUserLastIp() { 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/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java index f3171dcd..9a0ce4c9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/GetHouseholdsStatusController.java @@ -41,8 +41,8 @@ class GetHouseholdsStatusController { reqVO.getResearcherValue(), reqVO.getIsPanel(), AdminUtil.getLoginUserSeq(), - reqVO.getUserRole(), - reqVO.getUserRegionMainCode(), + AdminUtil.getLoginUserRole(), + AdminUtil.getLoginUserRegionMainCode(), Boolean.TRUE))); } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java index 93d29d73..213907a1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdsStatus/adapters/web/model/GetHouseholdsStatusReqVO.java @@ -41,8 +41,4 @@ public class GetHouseholdsStatusReqVO { private String researcherValue; // 패널 유지 여부 private Boolean isPanel; - // 로그인한 유저 역할 - private String userRole; - // 로그인한 유저 실사 지역 - private String userRegionMainCode; } diff --git a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml index 4abfbd25..50f2b4b1 100644 --- a/admin/src/main/resources/mappers/dashboard/ChartMapper.xml +++ b/admin/src/main/resources/mappers/dashboard/ChartMapper.xml @@ -69,7 +69,7 @@ and h.usage_type = #{usageType} LEFT JOIN household_visit hv - ON hv.household_seq = h.seq AND hv.is_deleted = false + ON hv.household_seq = h.seq AND hv.is_deleted = false AND to_char(hv.visit_date,'YYYYMM') = #{recordMonth} LEFT JOIN v_monthly_completion_rate v ON v.household_seq = h.seq AND v.record_month = #{recordMonth} WHERE u.parent_id = 'code.region.main' and u.in_use = true @@ -81,6 +81,7 @@ - - -
@@ -270,10 +267,10 @@
- - @@ -305,6 +302,8 @@ const selectedIndustryLargeCode = /*[[${reqVO.industryLargeCode}]]*/ ''; const selectedIndustryMiddleCode= /*[[${reqVO.industryMiddleCode}]]*/ ''; + const userRole = /*[[${userRole}]]*/ ''; + $(document).ready(function () { // 지역, 세부지역 셀렉트박스 세팅 setSelectBoxUiCode({ @@ -382,7 +381,7 @@ // 현재 로그인한 유저의 역할 - const isResearcher = f.userRole.value === 'ROLE_RESEARCHER'; + const isResearcher = userRole === 'ROLE_RESEARCHER'; const colspanLength = isResearcher ? 13 : 15; // 조사원일 경우 조사원이름, 번호 칼럼 hide diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html index a2093c0f..3ac53fcf 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -476,7 +476,7 @@ if (response.monthlyCarryOver != null) { $('#carryOver').text(Number(response.monthlyCarryOver).toLocaleString() + '원'); } else { - $('#carryOver').text('계산중입니다.'); + $('#carryOver').text('정산중입니다.'); } $('._monthlyCarryOver').show(); } else { diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index ed55196d..7db69c47 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -252,7 +252,7 @@ let $tab = $('.component-tab button[data-tab-value="' + tabActive + '"]'); getTabData($tab.data('tabType'), $tab.data('tabValue')); - }, 100); + }, 500); }); $('.select-tab').on('click', function () { diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index e73af2bc..e7c6a774 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -55,7 +55,7 @@ -
+
@@ -77,7 +77,7 @@
-
+
@@ -236,7 +236,7 @@ let $tab = $('.component-tab button[data-tab-value="' + tabActive + '"]'); getTabData($tab.data('tabType'), $tab.data('tabValue')); - }, 100); + }, 500); }); const getTabData = (tabType, tabValue) => { 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 () { + }, + }); + } + }, };