Merge branch 'dev' into 'deploy-dev-front'

Dev

See merge request korea-research/korea-research!47
This commit is contained in:
김현주 개발
2025-06-25 06:36:02 +00:00
83 changed files with 919 additions and 269 deletions

View File

@@ -15,14 +15,15 @@
</hgroup>
<section class="form-group">
<form method="post" name="reqForm" id="reqForm" onsubmit="event.preventDefault(); formControl.authInfoUser(event);" th:action="@{/}">
<form method="post" name="reqForm" id="reqForm" onsubmit="formControl.authInfoUser(event); return false;">
<input type="hidden" name="_csrf" th:value="${_csrf.token}" th:if="${_csrf != null}" />
<div class="component-input" data-props-toggle-Password="true">
<div class="input-label">
<label for="password" class="label-txt">비밀번호</label>
</div>
<div class="input-field">
<input type="password" id="password" placeholder="비밀번호 4자리를 입력해 주세요" name="password"
maxlength="4">
inputmode="numeric" pattern="[0-9]*" maxlength="4">
</div>
</div>
<div class="component-btns">
@@ -56,11 +57,12 @@
let formControl = {
authInfoUser(event) {
event.preventDefault();
if (event && typeof event.preventDefault === 'function') {
event.preventDefault();
}
const f = document.reqForm;
const obj = $(f).serializeObject();
console.log(obj)
ajaxUtil._ajaxAsync(
ENV.httpUrl.auth,
obj,

View File

@@ -107,7 +107,7 @@
<div class="d-flex">
<div class="component-input">
<div class="input-field">
<input type="number" id="phone1Id" th:value="${userInfo.phone1}" readonly>
<input type="number" id="phone1Id" name="phone1" th:value="${userInfo.phone1}" readonly>
</div>
</div>
@@ -333,13 +333,13 @@
// selectboxInstance1.setValue($('input[name=regionMainCode]').val());
},
confirmPopup() {
const currentName = document.querySelector('input[name="ownerName"]').value;
const currentName = document.querySelector('input[name="ownerName"]').value.trim();
// 사용자가 이름을 변경했을 경우에만 개인정보 변경 동의서 모달 띄우기
if (currentName !== ENV.initialOwnerName) {
if (currentName === '') { // 이름 비어있을 경우 유효성검사 실시
formControl.updateUserInfo();
} else if (currentName !== ENV.initialOwnerName) { // 이름이 변경됐을 경우 개인정보동의 모달창 띄우기
ENV.module.confirmPopup.open();
} else {
// 이름 그대로면 바로 저장
formControl.updateUserInfo();
}
},

View File

@@ -6,7 +6,7 @@
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
, btnDisabled=${(not btnActive)
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|| #strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
<div class="inner">
<hgroup class="tit-group">
@@ -36,7 +36,7 @@
<input type="checkbox" name="todayNone"
data-type="EXPENSE"
th:disabled="${not btnActive}"
th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
<span class="checkbox-item">
<span class="checkbox-txt">금일 등록내용 없음</span>
</span>
@@ -107,7 +107,7 @@
</button>
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(expenseList)}"
th:disabled="${not #strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(expenseList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>

View File

@@ -12,7 +12,7 @@
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
, btnDisabled=${(not btnActive)
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
[[${btnActive}]], [[${btnDisabled}]], [[${btnIcoClass}]]
@@ -44,7 +44,7 @@
<input type="checkbox" name="todayNone"
data-type="FARMING"
th:disabled="${not btnActive}"
th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
<span class="checkbox-item">
<span class="checkbox-txt">금일 등록내용 없음</span>
</span>
@@ -118,7 +118,7 @@
</button>
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.farmingStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(farmingList)}"
th:disabled="${not #strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(farmingList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>

View File

@@ -6,7 +6,7 @@
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
, btnDisabled=${(not btnActive)
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|| #strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
<div class="inner">
<hgroup class="tit-group">
@@ -36,7 +36,7 @@
<input type="checkbox" name="todayNone"
data-type="FORESTRY"
th:disabled="${not btnActive}"
th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
<span class="checkbox-item">
<span class="checkbox-txt">금일 등록내용 없음</span>
</span>
@@ -110,7 +110,7 @@
</button>
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.forestryStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(forestryList)}"
th:disabled="${not #strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(forestryList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>

View File

@@ -21,7 +21,7 @@
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
, btnDisabled=${(not btnActive)
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|| #strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
<div class="inner">
<hgroup class="tit-group">
@@ -52,7 +52,7 @@
<input type="checkbox" name="todayNone"
data-type="INCOME"
th:disabled="${not btnActive}"
th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
<span class="checkbox-item">
<span class="checkbox-txt">금일 등록내용 없음</span>
</span>
@@ -129,7 +129,7 @@
</button>
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(incomeList)}"
th:disabled="${not #strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(incomeList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>

View File

@@ -6,7 +6,7 @@
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
, btnDisabled=${(not btnActive)
|| #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|| #strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
<div class="inner">
<hgroup class="tit-group">
@@ -36,7 +36,7 @@
<input type="checkbox" name="todayNone"
data-type="POWER"
th:disabled="${not btnActive}"
th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
<span class="checkbox-item">
<span class="checkbox-txt">금일 등록내용 없음</span>
</span>
@@ -95,7 +95,7 @@
</button>
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.powerStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(powerList)}"
th:disabled="${not #strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(powerList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>

View File

@@ -6,7 +6,7 @@
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
, btnDisabled=${(not btnActive)
|| #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}
|| #strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
<div class="inner">
<hgroup class="tit-group">
@@ -36,7 +36,7 @@
<input type="checkbox" name="todayNone"
data-type="WORK"
th:disabled="${not btnActive}"
th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE)}">
th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
<span class="checkbox-item">
<span class="checkbox-txt">금일 등록내용 없음</span>
</span>
@@ -156,7 +156,7 @@
</button>
<button type="button" class="btn btn-l btn-primary _nextStep"
th:data-last="${dailyRecord.lastDay}"
th:disabled="${not #strings.equals(dailyRecord.workStatus, T(app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(workList)}"
th:disabled="${not #strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE) and #lists.isEmpty(workList)}"
th:onclick="krip.daily.goToNext([[${dailyRecord.nextStep}]], [[${reqVO.searchMonth}]], [[${reqVO.groupNo}]], [[${targetList}]])">
<span class="btn-txt">다음 단계로 이동</span>
</button>