diff --git a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java
index 38b7fee2..0c411ee9 100644
--- a/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java
+++ b/admin/src/main/java/app/module/admin/usecase/researcher/adpaters/web/model/ResearchersVisitDetailReqVO.java
@@ -14,5 +14,5 @@ public class ResearchersVisitDetailReqVO {
private String visitDate;
private ManagementType managementType;
private String content;
- private String isGiftSentFlag;
+ private String isGiftSent;
}
diff --git a/admin/src/main/resources/messages/uri.properties b/admin/src/main/resources/messages/uri.properties
index 2c61728c..3227db30 100644
--- a/admin/src/main/resources/messages/uri.properties
+++ b/admin/src/main/resources/messages/uri.properties
@@ -37,7 +37,7 @@ uri.admin.household.households.view.{{pathVar}}=\uC784\uAC00 \uC0C1\uC138
uri.admin.researcher=\uC870\uC0AC\uC6D0 \uD604\uD669
uri.admin.researcher.researchers=\uC870\uC0AC\uC6D0 \uD604\uD669
uri.admin.researcher.researchers.create=\uC870\uC0AC\uC6D0 \uB4F1\uB85D
-uri.admin.researcher.researchers.view.{{pathVar}}=\uC870\uC0AC\uC6D0 \uC0C1\uC138
+uri.admin.researcher.{{pathVar}}=\uC870\uC0AC\uC6D0 \uC0C1\uC138
uri.admin.dashboard=\uB300\uC2DC\uBCF4\uB4DC
uri.admin.dashboard.overview=\uB300\uC2DC\uBCF4\uB4DC
diff --git a/admin/src/main/resources/static/assets/images/common/ico_calendar.svg b/admin/src/main/resources/static/assets/images/common/ico_calendar.svg
new file mode 100644
index 00000000..316a9cd1
--- /dev/null
+++ b/admin/src/main/resources/static/assets/images/common/ico_calendar.svg
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/admin/src/main/resources/static/assets/styles/style.css b/admin/src/main/resources/static/assets/styles/style.css
index 065f253e..a1ddad5b 100644
--- a/admin/src/main/resources/static/assets/styles/style.css
+++ b/admin/src/main/resources/static/assets/styles/style.css
@@ -4704,6 +4704,9 @@ button.swiper-pagination-bullet {
display: -webkit-box;
display: -webkit-flex;
display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ align-items: center;
gap: 0.8rem;
}
@@ -4827,7 +4830,7 @@ input[type=number] {
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
- height: 16rem;
+ height: 32rem;
border: 1px solid gainsboro;
background-color: #ffffff;
overflow: hidden;
@@ -4984,6 +4987,96 @@ input[type=number] {
color: red;
}
+.input-file-group input {
+ display: none;
+}
+.input-file-group .file-txt {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ align-items: center;
+ -webkit-box-pack: center;
+ -webkit-justify-content: center;
+ justify-content: center;
+ width: 8rem;
+ height: 3.6rem;
+ background-color: #495057;
+ color: #FFFFFF;
+ font-size: 1.5rem;
+ font-weight: 600;
+ border-radius: 0.4rem;
+}
+.input-file-group .desc {
+ margin-top: 0.8rem;
+ display: block;
+ text-align: left;
+ font-size: 1.4rem;
+ color: #868E96;
+}
+.input-file-group .file-list {
+ margin-top: 1.6rem;
+ text-align: left;
+}
+.input-file-group .file-list li {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ align-items: center;
+}
+.input-file-group .file-list li .btn-delete {
+ margin-left: 0.4rem;
+ padding: 0;
+ width: 1.6rem;
+ height: 1.6rem;
+ background-image: url("../images/common/ico_close_white.svg");
+ background-color: #CED4DA;
+ background-repeat: no-repeat;
+ background-size: 10px 10px;
+ background-position: center;
+ border-radius: 0.2rem;
+}
+.input-file-group .file-list li + li {
+ margin-top: 0.8rem;
+}
+
+input[type=datetime-local] {
+ position: relative;
+ background: url("../images/common/ico_calendar.svg") no-repeat right 16px center/20px auto;
+}
+
+input[type=datetime-local]::-webkit-calendar-picker-indicator {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ background: transparent;
+ color: transparent;
+ cursor: pointer;
+}
+
+.date-range-group {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ align-items: center;
+ gap: 0.6rem;
+}
+.date-range-group .component-input {
+ width: -webkit-fit-content !important;
+ width: -moz-fit-content !important;
+ width: fit-content !important;
+}
+.date-range-group .component-input .input-field {
+ width: 23rem;
+}
+
/* component checkbox */
.component-input {
/* component checkbox switch */
diff --git a/admin/src/main/resources/templates/common/modal-household-mapping.html b/admin/src/main/resources/templates/common/modal-household-mapping.html
index b18e80e6..135bfb87 100644
--- a/admin/src/main/resources/templates/common/modal-household-mapping.html
+++ b/admin/src/main/resources/templates/common/modal-household-mapping.html
@@ -10,11 +10,11 @@
-
-
-
-
-
- 총 건
-
-
-
-
- 선택
- 임가번호
- 경영주명
- 휴대폰번호
- 실사
- 지역
- 세부지역
- 조사원
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 총 건
+
+
+
+
+ 선택
+ 임가번호
+ 경영주명
+ 휴대폰번호
+ 실사
+ 지역
+ 세부지역
+ 조사원
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html
index 55aad8a3..2fa66b87 100644
--- a/admin/src/main/resources/templates/researcher/detail.html
+++ b/admin/src/main/resources/templates/researcher/detail.html
@@ -198,7 +198,7 @@
tbody.append(
`
- ${ct.householdNum}
+ ${ct.householdNum}
${ct.ownerName || '-'}
${ct.phone || '-'}
${ct.regionMainCodeName || '-'}
@@ -271,7 +271,7 @@
- ${ct.householdNum}
+ ${ct.householdNum}
${ct.ownerName}
${ct.visitDate}
${ct.managementType}
diff --git a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html
index e25a6557..eb8af9ec 100644
--- a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html
+++ b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html
@@ -15,71 +15,75 @@
@@ -97,8 +101,22 @@
});
const showHouseholdModal2 = (seq) => {
- document.querySelector(".modal02").ui.open();
- //initFlatpickr();
+ const modal = document.querySelector(".modal02");
+ modal.ui.open();
+ const $el = document.querySelector('.component-datepicker');
+ const datepicker = etUI.components.DatepickerComp();
+ datepicker.core.init($el, {
+ dateSelectCallback: function (selectedDate) {
+ console.log('선택된 날짜:', selectedDate);
+ }
+ });
+
+ datepickerInstance = datepicker.getDatepickerInstance();
+
+ // 초기 상태 오늘 날짜로
+ if (datepickerInstance) {
+ datepickerInstance.setDate(new Date(), { render: true });
+ }
ajaxUtil._ajaxMethod(
'/api/researcher/visitHousehold/'+seq,
@@ -123,13 +141,15 @@
const setFormData = (data) => {
// 폼 필드에 데이터 세팅
const f = document.householdVisitReqForm;
- if (data.visitDate) {
- const visitDate = data.visitDate.substring(0, 10); // 'YYYY-MM-DD' 형식
- if (visitDatePicker) {
- f.visitDate.value = visitDate; // 입력 필드 먼저 설정
- visitDatePicker.setDate(visitDate); // Flatpickr 동기화
- }
+
+ if (datepickerInstance && data.visitDate) {
+
+ console.log(data.visitDate);
+ console.log(new Date(data.visitDate));
+
+ datepickerInstance.setDate(new Date(data.visitDate), { render: true });
}
+
if (data.managementType) {
f.managementType.value= data.managementType;
}
@@ -161,27 +181,48 @@
visitDatePicker = null;
}
- // 1. input 요소가 실제로 존재하는지 확인
+ // 입력 요소 확인
const input = document.getElementById('visitDate');
if (!input) {
console.warn('#visitDate input not found!');
return;
}
- // 2. input에 값이 있으면 flatpickr와 동기화
+ // 현재 값 가져오기
const currentVal = input.value;
- // 3. flatpickr 초기화
- visitDatePicker = flatpickr(input, {
- dateFormat: 'Y-m-d',
- defaultDate: currentVal || null, // 현재 값으로 초기 선택 날짜 설정
- enableTime: false,
- clickOpens: true,
- onChange: function (selectedDates, dateStr, instance) {
- console.log('날짜 선택됨:', dateStr);
- input.value = dateStr; // 수동으로 input 값 동기화
- },
- });
+ // Flatpickr 초기화
+ try {
+ visitDatePicker = flatpickr(input, {
+ dateFormat: 'Y-m-d',
+ defaultDate: currentVal || null,
+ enableTime: false,
+ clickOpens: true,
+ onReady: function () {
+ console.log('Flatpickr 초기화 완료');
+ },
+ onChange: function (selectedDates, dateStr, instance) {
+ console.log('날짜 선택됨:', dateStr);
+ input.value = dateStr; // 입력 필드 동기화
+ },
+ onOpen: function () {
+ console.log('Flatpickr 캘린더 열림');
+ },
+ onClose: function () {
+ console.log('Flatpickr 캘린더 닫힘');
+ }
+ });
+
+ // 입력 필드 클릭 이벤트 추가 (보조)
+ input.addEventListener('click', () => {
+ console.log('visitDate 입력 필드 클릭됨');
+ if (visitDatePicker) {
+ visitDatePicker.open(); // 수동으로 캘린더 열기
+ }
+ });
+ } catch (error) {
+ console.error('Flatpickr 초기화 실패:', error);
+ }
};
const updateHouseholdVisit = () => {
diff --git a/admin/src/main/resources/templates/researcher/researchers.html b/admin/src/main/resources/templates/researcher/researchers.html
index 5e034f6e..493ec830 100644
--- a/admin/src/main/resources/templates/researcher/researchers.html
+++ b/admin/src/main/resources/templates/researcher/researchers.html
@@ -125,7 +125,7 @@
tbody.append(
`
- ${ct.name || '-'}
+ ${ct.name || '-'}
${ct.phone || '-'}
${ct.regionMainCodeName || '-'}
${ct.householdCount || '-'}
diff --git a/core/src/main/resources/sql/schema/04_create-view.sql b/core/src/main/resources/sql/schema/04_create-view.sql
index 3e903776..99168975 100644
--- a/core/src/main/resources/sql/schema/04_create-view.sql
+++ b/core/src/main/resources/sql/schema/04_create-view.sql
@@ -80,5 +80,5 @@ SELECT
a.name AS researcher_name,
a.phone AS researcher_phone
FROM researcher_has_household rhh
- JOIN admin a ON rhh.admin_seq = a.seq
+ JOIN admin a ON rhh.admin_seq = a.seq and a.account_disabled = false
WHERE rhh.is_deleted = false;
\ No newline at end of file
diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css
index cf6f27c4..067136c6 100644
--- a/front/src/main/resources/static/assets/styles/style.css
+++ b/front/src/main/resources/static/assets/styles/style.css
@@ -1159,11 +1159,20 @@ button,
[type=button],
[type=reset],
[type=submit] {
+ outline: none;
-webkit-appearance: button;
-moz-appearance: button;
appearance: button;
}
+button:focus-visible {
+ outline: 1px solid #007bff;
+}
+
+button:focus:not(:focus-visible) {
+ outline: none;
+}
+
/*
* Remove the inner border and padding in Firefox.
*/
@@ -4292,6 +4301,7 @@ button.swiper-pagination-bullet {
.btn.btn-tertiary {
border-color: #f1f3f5;
background: #e9ecef;
+ color: #343a40;
}
.btn.btn-tertiary .btn-txt {
color: #343a40;
@@ -5096,6 +5106,12 @@ button.swiper-pagination-bullet {
flex-wrap: wrap;
}
.component-input .input-label .label-txt {
+ display: -webkit-box;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-box-align: center;
+ -webkit-align-items: center;
+ align-items: center;
position: relative;
font-size: 1.8rem;
line-height: 140%;
@@ -5103,6 +5119,7 @@ button.swiper-pagination-bullet {
color: #343a40;
}
.component-input .input-label .label-txt span {
+ display: inline-block;
font-size: 1.7rem;
line-height: 140%;
font-weight: 400;
@@ -6061,6 +6078,9 @@ button.swiper-pagination-bullet {
flex-wrap: wrap;
}
.select-group .select-label .label-txt {
+ display: -webkit-inline-box;
+ display: -webkit-inline-flex;
+ display: inline-flex;
position: relative;
font-size: 1.8rem;
line-height: 140%;
@@ -8447,6 +8467,7 @@ button.swiper-pagination-bullet {
justify-content: space-between;
}
.regist-item-area .item-list .list-item .item-tit-group .item-name {
+ max-width: 70%;
font-size: 2rem;
line-height: 140%;
font-weight: 700;
@@ -8502,6 +8523,7 @@ button.swiper-pagination-bullet {
line-height: 140%;
}
.regist-item-area .item-list .list-item .detail-list li span {
+ max-width: 80%;
color: #212529;
}
@@ -8766,6 +8788,9 @@ button.swiper-pagination-bullet {
flex: 1;
}
.form-group .input-flex-group.type-num .label-txt {
+ display: -webkit-inline-box;
+ display: -webkit-inline-flex;
+ display: inline-flex;
font-size: 1.8rem;
line-height: 140%;
font-weight: 700;
diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html
index 875d14dc..0158fe78 100644
--- a/front/src/main/resources/templates/info/user/user.html
+++ b/front/src/main/resources/templates/info/user/user.html
@@ -105,31 +105,12 @@