From dd32e47cacd9bdb9ea1ce9103bf7887f8f7756e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Tue, 24 Jun 2025 15:21:22 +0900 Subject: [PATCH] =?UTF-8?q?FO=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20input=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 --- .../model/ResearchersVisitDetailReqVO.java | 2 +- .../assets/images/common/ico_calendar.svg | 6 ++ .../resources/static/assets/styles/style.css | 95 ++++++++++++++++++- .../modal/modal-household-visit.html | 44 +++++++-- .../resources/templates/security/login.html | 9 +- 5 files changed, 140 insertions(+), 16 deletions(-) create mode 100644 admin/src/main/resources/static/assets/images/common/ico_calendar.svg 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/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/researcher/modal/modal-household-visit.html b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html index 79e832fb..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 @@ -20,7 +20,18 @@ 방문일 - +
+
+
+ + + 달력 + + +
+
+
관리분야 @@ -92,10 +103,21 @@ const showHouseholdModal2 = (seq) => { 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 }); + } - setTimeout(() => { - initFlatpickr(); // Flatpickr 초기화 통합 - }, 0); ajaxUtil._ajaxMethod( '/api/researcher/visitHousehold/'+seq, null, @@ -119,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; } diff --git a/front/src/main/resources/templates/security/login.html b/front/src/main/resources/templates/security/login.html index cd2b923d..0a3bea32 100644 --- a/front/src/main/resources/templates/security/login.html +++ b/front/src/main/resources/templates/security/login.html @@ -21,8 +21,8 @@
- +