Merge branch 'dev' into deploy-dev-front

This commit is contained in:
주수현
2025-07-15 08:38:01 +09:00
31 changed files with 244 additions and 215 deletions

View File

@@ -43,8 +43,10 @@ class UpdateNoticeController {
updateFilePortIn.operate(
new UpdateFileCmd(
reqVO.getId(),
reqVO.getFileMappingId().stream().map(Long::parseLong).toList(),
FileUploadType.NOTICE)
reqVO.getFileMappingId() != null
? reqVO.getFileMappingId().stream().map(Long::parseLong).toList()
: List.of(),
FileUploadType.NOTICE)
);
updateNoticePortIn.operate(

View File

@@ -10,19 +10,24 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@RequiredArgsConstructor
class SaveHouseholdVisitInfoDao implements SaveHouseholdVisitInfoPortOut {
private final SaveHouseholdVisitInfoMapper mapper;
private final SaveHouseholdVisitInfoMapper mapper;
@Override
@Transactional
public void operate(SaveHouseholdVisitInfoCmd cmd) {
if (cmd.getVisitInfoId() != null) {
mapper.findById(cmd.getHouseholdSeq())
.ifPresentOrElse(
v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)),
() -> { throw new IllegalArgumentException("방문정보가 없습니다."); }
);
} else {
mapper.createHouseholdVisitInfo(AuditUtil.create(cmd));
@Override
@Transactional
public void operate(SaveHouseholdVisitInfoCmd cmd) {
// 답례품 전달 완료일 경우 기존 방문들 중 true → false로 변경
if (Boolean.TRUE.equals(cmd.getIsGiftSent())) {
mapper.updateGiftSentToFalse(AuditUtil.update(cmd));
}
if (cmd.getVisitInfoId() != null) {
mapper.findById(cmd.getHouseholdSeq())
.ifPresentOrElse(v -> mapper.updateHouseholdVisitInfo(AuditUtil.update(cmd)),
() -> {
throw new IllegalArgumentException("방문정보가 없습니다.");
});
} else {
mapper.createHouseholdVisitInfo(AuditUtil.create(cmd));
}
}
}
}

View File

@@ -9,4 +9,6 @@ public interface SaveHouseholdVisitInfoMapper {
Optional<Long> findById(Long id);
void createHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd);
void updateHouseholdVisitInfo(SaveHouseholdVisitInfoCmd cmd);
void updateGiftSentToFalse(SaveHouseholdVisitInfoCmd cmd);
}

View File

@@ -67,6 +67,10 @@ public class ResearcherDao implements ResearcherPortOut {
@Override
@UpdateCommand
public Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO) {
if(Boolean.TRUE.equals(reqVO.getIsGiftSent())) {
researcherMapper.updateGiftSentToFalse(reqVO);
}
return researcherMapper.updateVisitHousehold(reqVO);
}

View File

@@ -21,6 +21,7 @@ public interface ResearcherMapper {
List<ResearchersHouseholdVisitDto> visitHouseholdList(ResearchersDetailReqVO reqVO);
ResearchersHouseholdVisitDto visitHouseholdDetail(Integer id);
Long visitHouseholdListCountAll(ResearchersDetailReqVO reqVO);
void updateGiftSentToFalse(ResearchersVisitDetailReqVO reqVO);
Integer updateVisitHousehold(ResearchersVisitDetailReqVO reqVO);
VisitHouseholdPercentageDto selectVisitHouseholdPercentage(ResearchersDetailReqVO reqVO);
Integer visitHouseholdDelete(@Param("selectIds") List<Integer> selectIds,@Param("deletedBy") String deletedBy);

View File

@@ -12,8 +12,9 @@ import java.time.LocalDateTime;
@Setter
public class ResearchersVisitDetailReqVO extends AuditCommand {
private Integer id;
private Long householdSeq;
private LocalDate visitDate;
private ManagementType managementType;
private String content;
private String isGiftSent;
private Boolean isGiftSent;
}

View File

@@ -28,7 +28,7 @@
<foreach collection="householdSeqs" item="householdSeq" separator=",">
(
nextval('researcher_has_household_seq'),
#{researcherSeq},
#{adminSeq},
#{householdSeq},
<include refid="common.fields.CreateUpdateBaseValues"/>
)

View File

@@ -17,6 +17,6 @@
WHERE household_seq = #{householdSeq}
AND TO_CHAR(visit_date, 'YYYYMM') = #{recordMonth}
AND hv.is_deleted = false
ORDER BY hv.created_at
ORDER BY hv.visit_date
</select>
</mapper>

View File

@@ -44,6 +44,7 @@
JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq
WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth}
AND rhh.is_deleted = false
AND v.is_deleted = false
) sub
WHERE rn &lt;= 2
GROUP BY household_seq

View File

@@ -37,6 +37,17 @@
WHERE id = #{visitInfoId}
</update>
<update id="updateGiftSentToFalse">
/* updateGiftSentToFalse : 동일 household_seq 의 다른 방문 중 전달여부 true → false */
UPDATE household_visit
SET is_gift_sent = false
WHERE household_seq = #{householdSeq}
AND TO_CHAR(visit_date, 'YYYYMM') = TO_CHAR(TO_DATE(#{visitDate}, 'YYYY-MM-DD'), 'YYYYMM')
AND is_gift_sent = true
AND (#{visitInfoId} IS NULL OR id != #{visitInfoId})
AND is_deleted = false
</update>
<select id="findById" resultType="java.lang.Long">
/* findById : 임가방문정보 조회 */
SELECT id

View File

@@ -106,11 +106,11 @@
from household h
join researcher_has_household rhh ON h.seq = rhh.household_seq and rhh.is_deleted = false
join admin a ON a.seq = rhh.admin_seq and a.is_deleted = false
left join uicode rm ON rm.parent_id = 'code.region.main' AND rm.id = h.region_main_code
left join uicode rs ON rs.parent_id = 'code.region.sub' AND rs.id = h.region_sub_code
left join uicode rm ON rm.id = h.region_main_code
left join uicode rs ON rs.id = h.region_sub_code
left join uicode rd ON rd.id = h.region_detail_code
left join uicode il ON il.parent_id = 'code.industry.large' AND il.id = h.industry_large_code
left join uicode im ON im.parent_id = 'code.industry.middle' AND im.id = h.industry_middle_code
left join uicode il ON il.id = h.industry_large_code
left join uicode im ON im.id = h.industry_middle_code
where 1=1
<if test="seq > 0">
and rhh.admin_seq = #{seq}
@@ -156,6 +156,7 @@
<if test="searchMonth != null and searchMonth != ''">
and TO_CHAR(rhv.visit_date ,'YYYYMM')= #{searchMonth}
</if>
order by rhv.visit_date
</select>
<select id="selectVisitHouseholdPercentage">
@@ -245,6 +246,17 @@
where rhv.is_deleted = false and rhv.id = #{id}
</select>
<update id="updateGiftSentToFalse">
/* updateGiftSentToFalse : 동일 household_seq 의 다른 방문 중 전달여부 true → false */
UPDATE household_visit
SET is_gift_sent = false
WHERE household_seq = #{householdSeq}
AND TO_CHAR(visit_date, 'YYYYMM') = TO_CHAR(#{visitDate}, 'YYYYMM')
AND is_gift_sent = true
AND (#{id} IS NULL OR id != #{id})
AND is_deleted = false
</update>
<update id="updateVisitHousehold">
update household_visit
set visit_date = #{visitDate},

View File

@@ -121,7 +121,7 @@
<tbody id="mappingHousehold-list"></tbody>
</table>
<!-- 페이지네이션 -->
<div class="row paging"></div>
<div class="row mapping-paging"></div>
<!-- 등록 버튼 -->
<div class="component-btns bottom-btn-group" th:fragment="modalButtons">
@@ -133,7 +133,7 @@
</div>
</section>
</div>
<button class="modal-close"></button>
<button type="button" class="modal-close"></button>
</div>
</form>
</div>
@@ -215,7 +215,7 @@
`);
});
// Pagination 구성하기
const paging = $('.paging');
const paging = $('.mapping-paging');
paging.empty();
paging.append(
uiUtil.getPagingUI(pageNo, response.size, response.totalPages,
@@ -257,6 +257,7 @@
function (response) {
if (response === selectedIds.length) {
alert('맵핑 완료되었습니다.');
getHouseholdList(0);
}
document.querySelector(".modal01").ui.close();
},

View File

@@ -20,27 +20,21 @@
<div class="input-group">
<div class="input-label">
<p class="label-txt">
검색필드
공지사항
</p>
</div>
<div class="component-select">
<select class="select-list" th:field="*{searchField}" id="searchField">
<option value="all" selected>전체</option>
<option value="title">제목</option>
<option value="updatedBy">작성자</option>
</select>
</div>
</div>
<div class="input-group">
<div class="input-label">
<p class="label-txt">
검색필드
</p>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="searchValue" th:field="*{searchValue}" placeholder="검색어를 입력하세요.">
<div class="d-flex">
<div class="component-select">
<select class="select-list" required th:field="*{searchField}">
<option value="all" selected>전체</option>
<option value="title">제목</option>
<option value="content">내용</option>
</select>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="searchValue" th:field="*{searchValue}" placeholder="검색어를 입력하세요." onkeypress="if(event.key === 'Enter') goSearch();">
</div>
</div>
</div>
</div>
@@ -48,18 +42,17 @@
<div class="input-group">
<div class="input-label">
<p class="label-txt">
검색필드
노출여부
</p>
</div>
<div class="component-select">
<select class="select-list" th:field="*{searchOpen}" id="searchOpen">
<select class="select-list" th:field="*{searchOpen}" id="searchOpen">
<option value="" selected>전체</option>
<option value="true">Y</option>
<option value="false">N</option>
</select>
</div>
</div>
</div>
<!-- 버튼 그룹 -->

View File

@@ -54,7 +54,7 @@
<p class="input-label" style="font-size: 16px; font-weight: bold;">내용</p>
<div class="component-input">
<div class="input-textarea-field">
<textarea id="memo" name="memo" class="textarea" placeholder="" th:text="${item.content}"></textarea>
<textarea id="memo" name="memo" class="textarea" placeholder="" th:text="${item.content}" readonly></textarea>
</div>
</div>

View File

@@ -36,7 +36,7 @@
<div class="component-input">
<div class="input-field">
<input type="text" class="datepicker-btn-trigger" name="visitDate" id="visitDate" aria-label="시작일"
placeholder="시작일을 입력해주세요" />
placeholder="방문일을 입력해주세요" />
<span class="input-field-btn datepicker-state">
<span class="hide-txt">달력</span>
<i class="ico-calendar ico-normal" aria-hidden="true"></i>

View File

@@ -218,22 +218,21 @@
document.querySelectorAll('input[name="forestRemoveIds"]:checked')
).map(el => Number(el.value));
const totalRows = document.querySelectorAll('input[name="forestRemoveIds"]').length;
if(checkedIds.length <= 0) {
alert("임산물을 선택해주세요.");
return
}
if (checkedIds.length === totalRows) {
alert("등록내용은 최소 1건이 남아있어야 합니다.");
return;
}
etUI.dialog.confirm({
title: '삭제 안내',
message: '선택하신 내용을 삭제하시겠습니까?<br>삭제한 항목은 복구할 수 없습니다.',
positiveCallback: function () {
const totalRows = document.querySelectorAll('.row-class').length;
if (totalRows - checkedIds.length <= 0) {
alert("등록내용은 최소 1건이 남아 있어야 합니다.");
return;
}
removeForestProduct(checkedIds);
},
});

View File

@@ -13,7 +13,7 @@
<button type="button" class="btn small btn-secondary" onclick="showDeleteVisitInfoConfirm();">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary" onclick="showVisitInfoModal();">
<button type="button" class="btn small btn-primary" id="visitAddBtn" onclick="showVisitInfoModal();">
<span class="btn-txt">추가</span>
</button>
</div>
@@ -54,6 +54,7 @@
const tbody = $('.tab-content.household-visit tbody');
tbody.empty();
$('#visitAddBtn').toggle(response.length < 2);
if(response.length === 0) {
tbody.append(`<tr><td colspan="6" style="text-align: center;">등록이 필요합니다.</td></tr>`);

View File

@@ -177,6 +177,12 @@
</section>
<th:block layout:fragment="script">
<script th:inline="javascript">
const managementType = {
VISIT: "방문조사",
CALL: "전화상담",
ETC: "기타"
};
// 탭 클릭 시 함수 호출
document.addEventListener('DOMContentLoaded', function () {
const tabButtons = document.querySelectorAll('.tab-label');
@@ -325,9 +331,12 @@
<td><a href="#" onclick="showHouseholdModal2(${ct.id});">${ct.householdNum}</a></td>
<td>${ct.ownerName}</td>
<td>${ct.visitDate}</td>
<td>${ct.managementType}</td>
<td>${managementType[ct.managementType]}</td>
<td><a href="javascript:void(0);" class="ellipsis" style="text-decoration: none;">${ct.content}</a></td>
<td>${ct.updatedAt}</td>
<td>
${ct.updatedBy}<br>
(${ct.updatedAt})
</td>
<td>${ct.isGiftSentFlag}</td>
</tr>
`

View File

@@ -15,6 +15,7 @@
<section>
<form autocomplete="off" method="get" name="householdVisitReqForm" >
<input type="hidden" name="id" id="id" />
<input type="hidden" name="householdSeq" id="householdSeq" />
<table class="type-form confirm" >
<colgroup>
<col width="8%" />
@@ -67,7 +68,7 @@
<td class="radio-group">
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="is_gift_sent_y" name="isGiftSent">
<input type="radio" id="is_gift_sent_y" name="isGiftSent" value="true">
<span class="radio-item">
<span class="radio-txt">전달</span>
</span>
@@ -75,7 +76,7 @@
</div>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="is_gift_sent_n" name="isGiftSent">
<input type="radio" id="is_gift_sent_n" name="isGiftSent" value="false">
<span class="radio-item">
<span class="radio-txt">미전달</span>
</span>
@@ -111,20 +112,6 @@
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 });
}
ajaxUtil._ajaxMethod(
'/api/researcher/visitHousehold/'+seq,
@@ -149,12 +136,8 @@
const setFormData = (data) => {
// 폼 필드에 데이터 세팅
const f = document.householdVisitReqForm;
// 날짜 세팅
if (datepickerInstance && data.visitDate) {
console.log(data.visitDate);
console.log(new Date(data.visitDate));
datepickerInstance.setDate(new Date(data.visitDate), { render: true });
}
@@ -163,6 +146,7 @@
}
f.content.value = data.content;
f.id.value = data.id;
f.householdSeq.value = data.householdSeq;
const isGift = data.isGiftSentFlag;
if (isGift === "t") {
document.getElementById('is_gift_sent_y').checked = true;
@@ -244,6 +228,7 @@
function (response) {
alert('수정 완료되었습니다.');
closeModal();
getHouseholdVisitList();
},
function (code, rstData) {
console.error('Error updating data:', code, rstData);
@@ -262,6 +247,28 @@
}
};
</script>
<script>
let datepickerInstance = null;
document.addEventListener('DOMContentLoaded', function () {
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 });
}
});
</script>
</section>
</div>
</html>

View File

@@ -35,10 +35,15 @@ public class DailyRecordDao implements DailyRecordPortOut {
if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) {
// 종료일의 달이 변경되면 시작일=종료일 처리
detail.setEndDate(detail.getStartDate());
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
}
}
detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate()));
if (detail.isLastDay()) {
detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate()));
}
detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate()));
detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate()));
detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate()));

View File

@@ -91,6 +91,8 @@ DELETE FROM uri WHERE id = 'uri.admin.communication.sms';
-- 문자발송 메뉴 숨기기
-- update uri set show_on_navi = false, updated_at = now(), updated_by = 'INIT_DATA' where id ='uri.admin.communication.sms' ;
-- 은행자동이체 내역 칼럼 타입 크기 변경
ALTER TABLE public.bank_auto_transfer ALTER COLUMN source_purpose TYPE varchar(100) USING source_purpose::varchar(100);
-- ====================================================================================================================
-- 문자 발송

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-subar}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout-none}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
<div layout:fragment="content" th:classappend="'mypage-wrap'">

View File

@@ -204,40 +204,41 @@
const clearAllItems = document.getElementById('clearAllItems');
if (ENV.data.editable) {
if(ENV.data.preEditable && ENV.data.pastBankList.length === 0 && ENV.data.currentMonth >= "202508"){
if( ENV.data.pastBankList.length === 0) {
callPastInfoBtn.disabled = true;
const handlePageShow = function(event) {
if ('sessionStorage' in window && window['sessionStorage'] !== null) {
// history.back으로 돌아온 경우 (navigation.type == 2)
if (event.persisted || (window.performance && window.performance.navigation.type === 2)) {
sessionStorage.removeItem('pastInputAlertShown'); // 플래그 제거
return; // 알림창 표시하지 않음
}
if (ENV.data.preEditable && ENV.data.pastBankList.length === 0 && ENV.data.currentMonth >= "202508") {
const handlePageShow = function (event) {
if ('sessionStorage' in window && window['sessionStorage'] !== null) {
// history.back으로 돌아온 경우 (navigation.type == 2)
if (event.persisted || (window.performance && window.performance.navigation.type === 2)) {
sessionStorage.removeItem('pastInputAlertShown'); // 플래그 제거
return; // 알림창 표시하지 않음
}
// 페이지가 처음 로드되었거나 새로고침된 경우 (navigation.type == 0 또는 1)
if (event.persisted || (window.performance && window.performance.navigation.type <= 1)) {
kri.isReturn = true;
const hasShownAlert = sessionStorage.getItem('pastInputAlertShown');
if (!hasShownAlert && ENV.data.pastBankList.length === 0) {
callPastInfoBtn.disabled = true;
etUI.dialog.alert({
title: '지난달 정보 등록하기',
message: '지난달 정보를 아직 입력하지 않으셨네요.\n정확한 조사를 위해 지난달 정보를 입력해주세요.\n\n확인 버튼을 누르시면 지난달 은행자동이체 내역등록으로 이동합니다.',
type: 'alert',
callback: function() {
sessionStorage.setItem('pastInputAlertShown', 'true');
location.href = ENV.httpUrl.preMonth + "/" + ENV.data.pastBankId;
},
});
// 페이지가 처음 로드되었거나 새로고침된 경우 (navigation.type == 0 또는 1)
if (event.persisted || (window.performance && window.performance.navigation.type <= 1)) {
kri.isReturn = true;
const hasShownAlert = sessionStorage.getItem('pastInputAlertShown');
if (!hasShownAlert && ENV.data.pastBankList.length === 0) {
etUI.dialog.alert({
title: '지난달 정보 등록하기',
message: '지난달 정보를 아직 입력하지 않으셨네요.\n정확한 조사를 위해 지난달 정보를 입력해주세요.\n\n확인 버튼을 누르시면 지난달 은행자동이체 내역등록으로 이동합니다.',
type: 'alert',
callback: function () {
sessionStorage.setItem('pastInputAlertShown', 'true');
location.href = ENV.httpUrl.preMonth + "/" + ENV.data.pastBankId;
},
});
}
}
}
}
};
};
// 초기 로드 시 실행
handlePageShow({ persisted: false, performance: window.performance });
// 초기 로드 시 실행
handlePageShow({persisted: false, performance: window.performance});
}
}
if (ENV.data.currentStatus == "NONE") {
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
@@ -474,15 +475,30 @@
const field = form.elements.namedItem(key);
if (field) {
field.value = val;
if(key == 'transferCategoryCode' && val == "code.bank.input.self"){
if(key === 'transferCategoryCode' && (val === "code.bank.input.self" || val === "code.bank.input.1" || val === "code.bank.input.4")){
document.getElementById(val+"_value").value = product["transferCategory"];
}
if(key == 'unitCode' && val == "code.count.unit.self"){
if(key === 'unitCode' && val === "code.count.unit.self"){
document.getElementById("unitDiv").style.display = "";
}
}
});
if (product.transferCategoryCode === "code.bank.input.self") {
const transferCategoryInput = document.getElementById(product.transferCategoryCode + "_value");
if (transferCategoryInput) {
transferCategoryInput.value = product.transferCategory || "";
}
}
// 단위 입력 필드 표시 여부 처리
if (product.unitCode === "code.count.unit.self") {
const unitDiv = document.getElementById("unitDiv");
if (unitDiv) {
unitDiv.style.display = "";
}
}
ENV.elementRefs.select.cropCodeSelect.setValue(product.cropCode);
ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode);
ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode);

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-subar}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
@@ -41,20 +41,18 @@
최근등록 : <span th:text="${dailyLatest}"></span></dd>
<dd class="date" th:if="${#strings.isEmpty(dailyLatest)}">등록된 일계부가 없습니다.</dd>
</dl>
<!--/* TODO : 2차 오픈 */-->
<th:block th:if="${@systemProperties['spring.profiles.active'] eq 'local'}">
<th:block th:if="${notice != null}">
<a th:href="@{'/info/notice/' + ${notice.id}}" class="notice-box">
<p class="tit">공지사항</p>
<p class="txt" th:text="${notice.title}"></p>
</a>
<div class="notice-box nodata"
th:unless="${notice != null}">
<a href="/info/notice" class="tit">공지사항</a>
<a href="javascript:void(0)" class="txt">등록된 공지사항이 없습니다</a>
</div>
</th:block>
<div class="notice-box nodata"
th:unless="${notice != null}">
<a href="/info/notice" class="tit">공지사항</a>
<a href="javascript:void(0)" class="txt">등록된 공지사항이 없습니다</a>
</div>
</th:block>
</div>
</section>

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-subar}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout-none}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
<div layout:fragment="content" th:classappend="'mypage-wrap'">

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-subar}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout-none}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
<div layout:fragment="content" th:classappend="'mypage-wrap'">

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-subar}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout-none}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">
<div layout:fragment="content" th:classappend="'mypage-wrap'">

View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html layout:decorate="~{layout/layout-subar}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
<html layout:decorate="~{layout/layout-none}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:th="http://www.thymeleaf.org">

View File

@@ -61,6 +61,7 @@
</div>
<div class="select-scroll">
<ul class="">
<li class="option" data-value="" th:classappend="${userInfo.tel1 == ''?' current':'' }">선택</li>
<li class="option" data-value="02" th:classappend="${userInfo.tel1 == '02'?' current':'' }">02</li>
<li class="option" data-value="031" th:classappend="${userInfo.tel1 == '031'?' current':'' }">31</li>
<li class="option" data-value="033" th:classappend="${userInfo.tel1 == '033'?' current':'' }">033</li>
@@ -135,7 +136,6 @@
</p>
</div>
<div id="regionSubCodeId" class="component-select bottom-sheet" data-props-default="지역 선택"
data-props-type="bottomSheet">
<input type="hidden" name="regionSubCode" data-type="select" th:value="${userInfo.regionSubCode}">
@@ -150,7 +150,6 @@
</button>
</div>
<div class="select-scroll">
<ul class="">
<!-- <th:block th:each="item : ${regionMainList}">-->
<!-- <li class="option" th:data-value="${item.id}"-->
@@ -197,7 +196,7 @@
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="temp_input_00023" placeholder="세부 주소를 입력해 주세요"
<input type="text" id="temp_input_00023" placeholder="전체 주소를 입력해 주세요"
th:field="*{address}" maxlength="50"/>
</div>
</div>
@@ -363,66 +362,73 @@
// selectboxInstance1.setValue($('input[name=regionMainCode]').val());
},
confirmPopup() {
//유효성 검사
const form = document.getElementById('reqForm');
kri.form.errorInit(form);
const selects = ['tel1', 'phone1', 'regionSubCode', 'regionDetailCode'];
selects.forEach(id => {
const sel = document.getElementById(id);
if (sel && sel.value) form[id].value = sel.value;
});
const errors = [];
if (!form.ownerName.value) errors.push({field: 'ownerName', message: '이름을 입력해 주세요.'});
if (!form.ownerAge.value) errors.push({field: 'ownerAge', message: '연령을 입력해 주세요.'});
if (form.ownerAge.value < 0 || form.ownerAge.value > 120) errors.push({field: 'ownerAge', message: '연령은 0세이상 120세 이하이어야 합니다.'});
if (form.tel1.value || form.tel2.value || form.tel3.value) {
if (!form.tel1.value || !form.tel2.value || !form.tel3.value) {
errors.push({ field: 'tel1', message: '가구 연락처를 모두 입력해 주세요.' });
} else {
const telRegex = /^(0[2-7][0-9]?)$/; // 지역번호 (예: 02, 031, 032 등)
if (!telRegex.test(form.tel1.value)) errors.push({ field: 'tel1', message: '가구 연락처를 입력해주세요' }); // 유효한 지역번호를 선택해 주세요.
if (form.tel2.value.length < 3 || form.tel2.value.length > 4) errors.push({ field: 'tel2', message: '가구 연락처를 입력해주세요.' });// 가구 연락처 중간 자리수는 3~4자리여야 합니다.
if (form.tel3.value.length !== 4) errors.push({ field: 'tel3', message: '가구 연락처를 입력해주세요.' }); // 가구 연락처 마지막 자리수는 4자리여야 합니다.
}
}
if (form.phone1.value || form.phone2.value || form.phone3.value) {
if (form.tel2.value.length === 3) errors.push({ field: 'tel1', message: '핸드폰 번호를 입력해 주세요.' });
if (form.tel2.value.length < 3 || form.tel2.value.length > 4) errors.push({ field: 'tel2', message: '핸드폰 번호를 입력해 주세요.' });
if (form.tel3.value.length !== 4) errors.push({ field: 'tel3', message: '핸드폰 번호를 입력해 주세요.' });
}
if (!form.phone1.value ||!form.phone2.value || !form.phone3.value) errors.push({field: 'phone1', message: '휴대폰 번호를 입력해 주세요.'});
if (form.phone1.value.length < 2 || form.phone2.value.length < 3 || form.phone2.value.length > 4 || form.phone3.value.length < 3 || form.phone3.value.length > 4) errors.push({field: 'phone1', message: '휴대폰 번호를 입력해 주세요.'});
if (!form.regionSubCode.value) errors.push({field: 'regionSubCode', message: '지역을 선택해 주세요.'});
if (!form.regionDetailCode.value) errors.push({field: 'regionDetailCode', message: '세부 지역를 선택해 주세요.'});
if (!form.address.value) errors.push({field: 'address', message: '전체 주소를 입력해 주세요.'});
kri.form.error(errors);
if (errors.length > 0) return;
// 이름 변경 여부 처리
const currentName = document.querySelector('input[name="ownerName"]').value.trim();
const isNameChanged = currentName !== ENV.initialOwnerName;
formControl.updateUserInfo(isNameChanged);
if(isNameChanged){
ENV.module.confirmPopup.open();
}else {
formControl.updateUserInfo();
}
},
confirmPopupOk() {
ENV.module.confirmPopup.close();
setTimeout(() => {
ajaxUtil._alert('개인정보 변경이 완료되었습니다.', null, () => {
location.href = '/info';
});
}, 500);
formControl.updateUserInfo();
},
updateUserInfo(showPopupIfValidNameChanged = false) {
updateUserInfo() {
const f = document.reqForm;
// // TODO 어쩔수 없이 이렇게 하는데..... 콤포넌트값 핸들링 방법 UX에서 지정하면 수정해야함.
// const tel1Element = document.getElementById('tel1Id');
// const phone1IdElement = document.getElementById('phone1Id');
// const regionMainCodeIdElement = document.getElementById('regionMainCodeId');
// const regionSubCodeIdElement = document.getElementById('regionSubCodeId');
// if (tel1Element && tel1Element.value) {
// f.tel1.value = tel1Element.value;
// }
// if (phone1IdElement && phone1IdElement.value) {
// f.phone1.value = phone1IdElement.value;
// }
// if (regionMainCodeIdElement && regionMainCodeIdElement.value) {
// f.regionMainCode.value = regionMainCodeIdElement.value;
// }
// if (regionSubCodeIdElement && regionSubCodeIdElement.value) {
// f.regionSubCode.value = regionSubCodeIdElement.value;
// }
f.regionSubCode.value = ENV.select.regionSelect.getParentValue();
f.regionDetailCode.value = ENV.select.regionSelect.getChildValue();
f.tel1.value = ENV.select.selectTel.getValue();
f.phone1.value = ENV.select.selectPhone.getValue();
const obj = $(f).serializeObject();
console.log(obj)
ajaxUtil._ajaxAsync(
ENV.httpUrl.user,
obj,
$(f).serializeObject(),
function (rstData, status) {
if (rstData.code === 'SUCCESS') {
// 유효성 검사를 모두 통과한 후
if (showPopupIfValidNameChanged) {
// 이름이 바뀐 경우만 팝업
ENV.module.confirmPopup.open();
} else {
ajaxUtil._alert('개인정보 변경이 완료되었습니다.', null, () => {
location.href = '/info';
});
}
ajaxUtil._alert('개인정보 변경이 완료되었습니다.', null, () => {
location.href = '/info';
});
} else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);
}

View File

@@ -23,7 +23,7 @@
body, html {height: 100%; font-family: "Pretendard Variable", Pretendard, -apple-system, BlinkMacSystemFont, system-ui, Roboto, "Helvetica Neue", "Segoe UI", "Apple SD Gothic Neo", "Noto Sans KR", "Malgun Gothic", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", sans-serif;}
#wrap {height: 100%;}
.error-wrap {padding-top: 120px;}
.error-wrap main {display: flex; flex-direction: column; width: 310px; margin: 0 auto; padding-top: 88px; background:url('../../assets/images/common/ico_nodata.svg') center top / 64px no-repeat;}
.error-wrap main {display: flex; flex-direction: column; width: 310px; margin: 0 auto; padding-top: 88px; background:url('/static/assets/images/common/ico_nodata.svg') center top / 64px no-repeat;}
.info-msg {display: flex; flex-direction: column; align-items: center;}
.info-msg strong {display: block; font-size: 24px; font-weight: 700; color: #212529; line-height: 140%; text-align: center;}
.info-msg span {display: block; margin-top: 8px; font-size: 15px; font-weight: 400; color: #495057; line-height: 140%; text-align: center;}

View File

@@ -1,47 +0,0 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org" lang="ko">
<head th:replace="~{common/components :: head}"></head>
<body>
<div id="wrap">
<div class="loading dimmed" id="loadingBar" style="display: none"><i class="ico-spinner" aria-hidden="true"></i></div>
<section th:replace="~{common/components :: header(true)}"></section>
<div id="container" layout:fragment="content">
page content
</div>
<section th:replace="~{common/components :: footer}"></section>
<section th:replace="~{common/components :: floating-totop}"></section>
<div id="bindWrap"><!--/* 공통으로 사용하는 영역 */--></div>
<!--/* 공통으로 사용하는 모달 팝업 */-->
<div class="layer-wrap">
<div class="component-modal commModal" data-props-dimm-click="true">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">
<!--/* bind title */-->
</h3>
</div>
<div class="modal-content">
<!--/* bind wrap */-->
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</div>
<!--/* //공통으로 사용하는 모달 팝업 */-->
<!--/* 전체 메뉴 모달 팝업 */-->
<th:block th:replace="~{common/menu-modal}"></th:block>
<!--/* //전체 메뉴 모달 팝업 */-->
</div>
<section layout:fragment="script"></section>
</body>
</html>