Merge branch 'dev' into 0623_fetch

This commit is contained in:
주수현
2025-06-27 16:49:11 +09:00
52 changed files with 368 additions and 179 deletions

View File

@@ -48,8 +48,8 @@ public class AdminCreateValidator implements Validator {
if (vo.getName() == null || vo.getName().isBlank()) {
errors.rejectValue("name", "error.name", "이름을 입력해주세요.");
}
if (vo.getName().length() > 4) {
errors.rejectValue("name", "error.name", "이름은 4자리까지 입력가능합니다.");
if (vo.getName().length() > 10) {
errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다.");
}
if (vo.getPhone1() == null || vo.getPhone1().isBlank()) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요.");

View File

@@ -34,8 +34,8 @@ public class AdminUpdateValidator implements Validator {
if (vo.getName() == null || vo.getName().isBlank()) {
errors.rejectValue("name", "error.name", "이름을 입력해주세요.");
}
if (vo.getName().length() > 4) {
errors.rejectValue("name", "error.name", "이름은 4자리까지 입력가능합니다.");
if (vo.getName().length() > 10) {
errors.rejectValue("name", "error.name", "이름은 10자까지 입력가능합니다.");
}
if (vo.getPhone1() == null || vo.getPhone1().isBlank()) {
errors.rejectValue("phone1", "error.phone1", "전화번호 앞자리를 입력해주세요.");

View File

@@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.removeDaily.adapters.
import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.RemoveDailyPortOut;
import app.module.admin.usecase.household.tab.dailyRecord.removeDaily.ports.application.domain.RemoveDailyCmd;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.enums.DailySort;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Repository;
public class RemoveDailyDao implements RemoveDailyPortOut {
private final RemoveDailyMapper mapper;
@UpdateCommand
@Override
public void operate(RemoveDailyCmd command) {
if (command.getCurrentStep() != null) {

View File

@@ -15,11 +15,9 @@ public class RemoveDailyService implements RemoveDailyPortIn {
@Override
public void operate(RemoveDailyReqVO reqVO) {
RemoveDailyCmd command = AuditUtil.update(
new RemoveDailyCmd(
reqVO.getSelectedIds(),
reqVO.getCurrentStep())
);
RemoveDailyCmd command = new RemoveDailyCmd(
reqVO.getSelectedIds(),
reqVO.getCurrentStep());
portOut.operate(command);
}

View File

@@ -2,6 +2,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.adapt
import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.UpdateDailyNonePortOut;
import app.module.admin.usecase.household.tab.dailyRecord.updateDailyNone.ports.application.domain.UpdateDailyNoneCmd;
import app.module.core.config.application.annotation.UpdateCommand;
import app.module.core.config.application.enums.DailySort;
import app.module.core.config.application.enums.DailyTargetStatus;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
@@ -16,6 +17,7 @@ class UpdateDailyNoneDao implements UpdateDailyNonePortOut {
private final UpdateDailyNoneMapper mapper;
private final DailyRecordPortIn dailyRecordPortIn;
@UpdateCommand
@Override
public void create(UpdateDailyNoneCmd command) {
command.setDailyRecordSeq(mapper.getDailyRecordSeq(command));

View File

@@ -18,15 +18,13 @@ public class UpdateDailyNoneService implements UpdateDailyNonePortIn {
public void create(UpdateDailyNoneReqVO formVO) {
DailyTargetStatus currentStatus = "Y".equals(formVO.getTodayNone()) ? DailyTargetStatus.TODAY_NONE : DailyTargetStatus.TARGET;
UpdateDailyNoneCmd command = AuditUtil.update(
new UpdateDailyNoneCmd(
formVO.getRecordMonth(),
formVO.getGroupNo(),
formVO.getHouseholdSeq(),
formVO.getCurrentStep(),
currentStatus,
null)
);
UpdateDailyNoneCmd command = new UpdateDailyNoneCmd(
formVO.getRecordMonth(),
formVO.getGroupNo(),
formVO.getHouseholdSeq(),
formVO.getCurrentStep(),
currentStatus,
null);
portOut.create(command);
}

View File

@@ -115,4 +115,5 @@ public class ResearcherDao implements ResearcherPortOut {
}
return i;
}
}

View File

@@ -17,6 +17,7 @@ import java.util.Objects;
@RequiredArgsConstructor
@RequestMapping(path = "/api/researcher")
class ResearcherApiController {
private final ResearcherPortIn researcherPortIn;
@GetMapping(path = "/list")
@@ -63,4 +64,5 @@ class ResearcherApiController {
ResponseEntity<?> updateMappingHousehold(@RequestBody MappingHouseholdListReqVO reqVO ) {
return ResponseEntity.status(HttpStatus.OK).body(researcherPortIn.updateMappingHousehold(reqVO));
}
}

View File

@@ -7,6 +7,7 @@ import org.springframework.data.domain.Page;
import java.util.List;
public interface ResearcherPortIn {
Page<ResearchersDto> list(ResearchersListReqVO reqVO);
ResearchersDto detail(Integer adminSeq);
Page<ResearchersMappingHouseholdDto> mappingHouseholdList(ResearchersDetailReqVO reqVO);
@@ -17,4 +18,5 @@ public interface ResearcherPortIn {
Integer visitHouseholdDelete(List<Integer> selectIds);
Page<GetPopupHouseholds> searchMappingHousehold(HouseholdSearchReqVO reqVO);
Integer updateMappingHousehold(MappingHouseholdListReqVO reqVO);
}

View File

@@ -64,9 +64,9 @@ app:
permit: 5
session:
validity:
# 세션 유효기간(초) - 1시간 (3600초)
# 세션 유효기간(초) - 무한정으로 수정,,,
period:
seconds: 3600
seconds: -1
maximum:
# 최대 세션 갯수 (1일 경우 중복 로그인 불가)
num: 1

View File

@@ -19,6 +19,9 @@
left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true and h.is_deleted = false
where
ahr.role_id = 'ROLE_RESEARCHER'
<if test="searchField == '' and searchValue != null and searchValue != ''">
and ( a.name LIKE CONCAT('%', #{searchValue}, '%') or a.phone LIKE CONCAT('%', #{searchValue}, '%') )
</if>
<if test="searchField == 'name' and searchValue != null and searchValue != ''">
and a.name LIKE CONCAT('%', #{searchValue}, '%')
</if>

View File

@@ -79,7 +79,7 @@
<div class="input-field">
<input id="name" type="text" name="name"
th:classappend="${#fields.hasErrors('name')} ? 'is-invalid'"
th:field="*{name}"/>
th:field="*{name}" maxlength="10"/>
<div class="invalid-feedback fw-bold"
th:if="${#fields.hasErrors('name')}">
에러 메세지
@@ -97,12 +97,12 @@
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="phone1" name="phone1" placeholder="" th:field="*{phone1}">
<input type="number" id="phone1" name="phone1" placeholder="" th:field="*{phone1}" maxlength="4">
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="phone2" name="phone2" placeholder="" th:field="*{phone2}">
<input type="number" id="phone2" name="phone2" placeholder="" th:field="*{phone2}" maxlength="4">
</div>
</div>
</div>

View File

@@ -165,7 +165,6 @@
f.searchDisabled.value = '';
}
function goUpdate(adminId) {
location.href = '/settings/admins/update/' + adminId; // 쿼리 파라미터 없이 이동
}

View File

@@ -71,7 +71,7 @@
<div class="input-field">
<input id="name" type="text" name="name"
th:classappend="${#fields.hasErrors('name')} ? 'is-invalid'"
th:field="*{name}"/>
th:field="*{name}" maxlength="10" />
<div class="invalid-feedback fw-bold"
th:if="${#fields.hasErrors('name')}">
에러 메세지
@@ -89,7 +89,7 @@
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="phone1" name="phone1" placeholder=""
<input type="number" id="phone1" name="phone1" placeholder="" maxlength="4"
th:value="${bindingVO.phone1 != null ? bindingVO.phone1 : ''}">
</div>
</div>
@@ -99,7 +99,7 @@
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="phone2" name="phone2" placeholder=""
<input type="number" id="phone2" name="phone2" placeholder="" maxlength="4"
th:value="${bindingVO.phone2 != null ? bindingVO.phone2 : ''}">
</div>
</div>

View File

@@ -145,6 +145,7 @@
(response) => {
console.log("임가방문정보 상세 응답값 : ", response);
setVisitFormData(response);
document.querySelector(".modal-visit-info").ui.open();
},
function (code, rstData) {
console.log("error : ", code);
@@ -152,9 +153,9 @@
'get',
'json'
);
} else {
document.querySelector(".modal-visit-info").ui.open();
}
document.querySelector(".modal-visit-info").ui.open();
}
// 임가방문정보 상세 값 set

View File

@@ -222,9 +222,6 @@
etUI.dialog.confirm({
title: '삭제 안내',
message: '선택하신 내용을 삭제하시겠습니까?<br>삭제한 항목은 복구할 수 없습니다.',
negativeCallback: function () {
},
positiveCallback: function () {
goDeleteForestProduct(checkedIds);
},
@@ -234,7 +231,6 @@
// 임산물현황 삭제
const goDeleteForestProduct = (checkedIds) => {
const f = document.reqForm;
console.log("f.monthlyInputStatusId.value", f.monthlyInputStatusId.value);
ajaxUtil._ajaxMethod(
'/api/household/forestProducts/delete',

View File

@@ -10,7 +10,7 @@
<h3></h3>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn small btn-secondary" onclick="goDeleteVisitInfo();">
<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();">
@@ -94,38 +94,47 @@
);
}
// 임가방문정보 삭제
const goDeleteVisitInfo = () => {
// 임가방문정보 삭제 confirm
const showDeleteVisitInfoConfirm = () => {
const checkedIds = Array.from(
document.querySelectorAll('input[name="visitRemoveIds"]:checked')
).map(el => Number(el.value));
if(checkedIds.length <= 0) {
alert("임가방문정보를 선택해주세요.");
return
return;
}
if(confirm("선택하신 내용을 삭제하시겠습니까? 삭제한 항목은 복구할 수 없습니다.")) {
const f = document.reqForm;
etUI.dialog.confirm({
title: '삭제 안내',
message: '선택하신 내용을 삭제하시겠습니까?<br>삭제한 항목은 복구할 수 없습니다.',
positiveCallback: function () {
goDeleteVisitInfo(checkedIds);
},
});
}
ajaxUtil._ajaxMethod(
'/api/visitInfo/remove',
JSON.stringify({
householdSeq: f.householdSeq.value,
visitRemoveIds: checkedIds
}),
(response) => { // 성공
alert("방문정보가 삭제되었습니다.");
getVisitInfo();
},
function (code, rstData) {
if(code == 422) alert(rstData.responseText);
},
'delete',
'json',
{ handle422Type: 'alert' }
);
}
// 임가방문정보 삭제
const goDeleteVisitInfo = (checkedIds) => {
const f = document.reqForm;
ajaxUtil._ajaxMethod(
'/api/visitInfo/remove',
JSON.stringify({
householdSeq: f.householdSeq.value,
visitRemoveIds: checkedIds
}),
() => { // 성공
alert("방문정보가 삭제되었습니다.");
getVisitInfo();
},
function (code, rstData) {
if(code == 422) alert(rstData.responseText);
},
'delete',
'json',
{ handle422Type: 'alert' }
);
}
</script>
</div>

View File

@@ -25,7 +25,7 @@
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="temp_input_0001" th:field="*{searchValue}" placeholder="검색어를 입력하세요.">
<input type="text" id="temp_input_0001" th:field="*{searchValue}" placeholder="검색어를 입력하세요." onkeypress="if(event.key === 'Enter') goSearch();">
</div>
</div>
</div>
@@ -181,6 +181,8 @@
f.searchValue.value = '';
f.searchArea.value = '';
f.searchAccountDisabled.value = '';
f.method = 'GET';
f.submit();
}
// 상세페이지 이동
function goDetail(seq) {

View File

@@ -101,7 +101,9 @@ public class FrontSecurityConfig {
.clearAuthentication(true)
.logoutRequestMatcher(new AntPathRequestMatcher("/logout")))
.sessionManagement(
session -> session.maximumSessions(maxSessionNum).maxSessionsPreventsLogin(false))
session -> session.maximumSessions(maxSessionNum).maxSessionsPreventsLogin(false).expiredUrl("/login"))
.sessionManagement(
session -> session.invalidSessionUrl("/login"))
.oauth2Login(
config ->
config

View File

@@ -9,4 +9,9 @@ public class CommonConstants {
* 단위의 직접입력 코드
*/
public static final String UNIT_CODE_SELF = "code.record.unit.self";
/**
* 작업 면적의 직접입력 코드
*/
public static final String AREA_CODE_OTHER = "code.record.area.self";
}

View File

@@ -21,6 +21,24 @@ public class CreateDailyExpenseValidator implements Validator {
public void validate(Object target, Errors errors) {
CreateDailyExpenseReqVO vo = (CreateDailyExpenseReqVO) target;
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if (vo.getPrice() == null && vo.getEstimatedValue() == null) {
errors.rejectValue(
"price", "valid.common.required",
@@ -29,11 +47,5 @@ public class CreateDailyExpenseValidator implements Validator {
"estimatedValue", "valid.common.required",
"현금 또는 현물평가액을 입력해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
}
}

View File

@@ -21,7 +21,7 @@ public class CreateDailyFarmingReqVO extends DailyUIReqVO {
/**
* 생산물
*/
@NotBlank(message = "생산물을 입력해 주세요.")
@NotBlank(message = "생산물을 선택해 주세요.")
private String productCode;
/**
* 생산물 직접 입력

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.farming.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
@@ -20,12 +21,30 @@ public class CreateDailyFarmingValidator implements Validator {
public void validate(Object target, Errors errors) {
CreateDailyFarmingReqVO vo = (CreateDailyFarmingReqVO) target;
if ("SELF".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) {
if ("code.record.farming.self".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) {
errors.rejectValue(
"categorySelf", "valid.common.required",
"productSelf", "valid.common.required",
"생산물을 입력해 주세요.");
}
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if (vo.getEstimatedValue() == null) {
errors.rejectValue(
"estimatedValue", "valid.common.required",

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.forestry.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.forestry.adapters.web.model.CreateDailyForestryReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
@@ -20,6 +21,24 @@ public class CreateDailyForestryValidator implements Validator {
public void validate(Object target, Errors errors) {
CreateDailyForestryReqVO vo = (CreateDailyForestryReqVO) target;
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if (vo.getEstimatedValue() == null) {
errors.rejectValue(
"estimatedValue", "valid.common.required",

View File

@@ -21,6 +21,24 @@ public class CreateDailyIncomeValidator implements Validator {
public void validate(Object target, Errors errors) {
CreateDailyIncomeReqVO vo = (CreateDailyIncomeReqVO) target;
if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"quantity", "valid.common.required",
"수량을 입력해 주세요.");
}
if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) {
errors.rejectValue(
"unitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if (vo.getPrice() == null && vo.getEstimatedValue() == null) {
errors.rejectValue(
"price", "valid.common.required",
@@ -29,11 +47,5 @@ public class CreateDailyIncomeValidator implements Validator {
"estimatedValue", "valid.common.required",
"현금 또는 현물평가액을 입력해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
errors.rejectValue(
"unitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
}
}

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.work.adapters.web.validator;
import app.module.front.config.constants.CommonConstants;
import app.module.front.usecase.daily.work.adapters.web.model.CreateDailyWorkReqVO;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
@@ -20,19 +21,37 @@ public class CreateDailyWorkValidator implements Validator {
public void validate(Object target, Errors errors) {
CreateDailyWorkReqVO vo = (CreateDailyWorkReqVO) target;
if (vo.getHarvestQuantity() == null) {
if (vo.getWorkLandArea() == null && !StringUtils.isBlank(vo.getAreaUnitCode())) {
errors.rejectValue(
"harvestQuantity", "valid.common.required",
"수확량을 입력해 주세요.");
"workLandArea", "valid.common.required",
"작업 면적을 입력해 주세요.");
}
if ("SELF".equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) {
if (vo.getWorkLandArea() != null && StringUtils.isBlank(vo.getAreaUnitCode())) {
errors.rejectValue(
"areaUnitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.AREA_CODE_OTHER.equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) {
errors.rejectValue(
"areaUnitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if ("SELF".equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) {
if (vo.getHarvestQuantity() == null && !StringUtils.isBlank(vo.getHarvestUnitCode())) {
errors.rejectValue(
"harvestQuantity", "valid.common.required",
"수확량을 입력해 주세요.");
}
if (vo.getHarvestQuantity() != null && StringUtils.isBlank(vo.getHarvestUnitCode())) {
errors.rejectValue(
"harvestUnitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) {
errors.rejectValue(
"harvestUnitSelf", "valid.common.required",
"단위를 입력해 주세요.");

View File

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
public class UpdateUserReqVO {
@NotBlank(message = "이름을 입력해주세요.")//"이름은 필수 항목입니다.")
@Pattern(regexp = "^[가-힣]{2,10}$", message = "이름을 입력해주세요.")//"이름은 2~10자의 한글이어야 합니다.")
@Pattern(regexp = "^[가-힣0-9()]{2,10}$", message = "이름을 입력해주세요.")//"이름은 2~10자의 한글이어야 합니다.")
private String ownerName;
@NotNull(message = "나이를 입력해주세요.")
@@ -19,13 +19,13 @@ public class UpdateUserReqVO {
@Max(value = 120, message = "나이를 입력해주세요.")//"나이는 120세 이하이어야 합니다.")
private Integer ownerAge;
@Pattern(regexp = "^\\d{2,3}$", message = "가구 연락처를 입력해주세요.")//"가구 연락처는 2~3자리 숫자여야 합니다.")
@Pattern(regexp = "^$|^\\d{2,3}$", message = "가구 연락처를 입력해주세요.")//"가구 연락처는 2~3자리 숫자여야 합니다.")
private String tel1;
@Pattern(regexp = "^\\d{3,4}$", message = "가구 연락처를 입력해주세요.")//"가운데 번호는 3~4자리 숫자여야 합니다.")
@Pattern(regexp = "^$|^\\d{3,4}$", message = "가구 연락처를 입력해주세요.")//"가운데 번호는 3~4자리 숫자여야 합니다.")
private String tel2;
@Pattern(regexp = "^\\d{4}$", message = "가구 연락처를 입력해주세요.")//"끝 번호는 4자리 숫자여야 합니다.")
@Pattern(regexp = "^$|^\\d{4}$", message = "가구 연락처를 입력해주세요.")//"끝 번호는 4자리 숫자여야 합니다.")
private String tel3;
@Pattern(regexp = "^\\d{2,3}$", message = "휴대폰 번호를 입력해주세요.")//"휴대폰 번호는 2~3자리 숫자여야 합니다.")

View File

@@ -0,0 +1,3 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.332 2.5C17.8549 2.5 22.332 6.97715 22.332 12.5C22.332 18.0228 17.8549 22.5 12.332 22.5C6.80918 22.5 2.33203 18.0228 2.33203 12.5C2.33203 6.97715 6.80918 2.5 12.332 2.5ZM12.332 4.5C7.91375 4.5 4.33203 8.08172 4.33203 12.5C4.33203 16.9183 7.91375 20.5 12.332 20.5C16.7503 20.5 20.332 16.9183 20.332 12.5C20.332 8.08172 16.7503 4.5 12.332 4.5ZM12.4346 11.1299C12.9387 11.1812 13.332 11.6073 13.332 12.125V16.0322C13.7632 16.1433 14.082 16.5341 14.082 17C14.082 17.5523 13.6343 18 13.082 18H12.332C11.7797 18 11.332 17.5523 11.332 17V13.0918C10.9009 12.9806 10.582 12.5908 10.582 12.125C10.582 11.5727 11.0297 11.125 11.582 11.125H12.332L12.4346 11.1299ZM12.1445 6.875C12.973 6.875 13.6445 7.54657 13.6445 8.375C13.6445 9.20343 12.973 9.875 12.1445 9.875C11.3161 9.875 10.6445 9.20343 10.6445 8.375C10.6445 7.54657 11.3161 6.875 12.1445 6.875Z" fill="#ADB5BD"/>
</svg>

After

Width:  |  Height:  |  Size: 974 B

View File

@@ -0,0 +1,3 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.332 2.5C17.8549 2.5 22.332 6.97715 22.332 12.5C22.332 18.0228 17.8549 22.5 12.332 22.5C6.80918 22.5 2.33203 18.0228 2.33203 12.5C2.33203 6.97715 6.80918 2.5 12.332 2.5ZM11.582 11.125C11.0297 11.125 10.582 11.5727 10.582 12.125C10.582 12.5908 10.9009 12.9806 11.332 13.0918V17C11.332 17.5523 11.7797 18 12.332 18H13.082C13.6343 18 14.082 17.5523 14.082 17C14.082 16.5341 13.7632 16.1433 13.332 16.0322V12.125C13.332 11.6073 12.9387 11.1812 12.4346 11.1299L12.332 11.125H11.582ZM12.1445 6.875C11.3161 6.875 10.6445 7.54657 10.6445 8.375C10.6445 9.20343 11.3161 9.875 12.1445 9.875C12.973 9.875 13.6445 9.20343 13.6445 8.375C13.6445 7.54657 12.973 6.875 12.1445 6.875Z" fill="#4BBC43"/>
</svg>

After

Width:  |  Height:  |  Size: 800 B

View File

@@ -0,0 +1,3 @@
<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.332 2.5C17.8549 2.5 22.332 6.97715 22.332 12.5C22.332 18.0228 17.8549 22.5 12.332 22.5C6.80918 22.5 2.33203 18.0228 2.33203 12.5C2.33203 6.97715 6.80918 2.5 12.332 2.5ZM12.332 4.5C7.91375 4.5 4.33203 8.08172 4.33203 12.5C4.33203 16.9183 7.91375 20.5 12.332 20.5C16.7503 20.5 20.332 16.9183 20.332 12.5C20.332 8.08172 16.7503 4.5 12.332 4.5ZM12.4346 11.1299C12.9387 11.1812 13.332 11.6073 13.332 12.125V16.0322C13.7632 16.1433 14.082 16.5341 14.082 17C14.082 17.5523 13.6343 18 13.082 18H12.332C11.7797 18 11.332 17.5523 11.332 17V13.0918C10.9009 12.9806 10.582 12.5908 10.582 12.125C10.582 11.5727 11.0297 11.125 11.582 11.125H12.332L12.4346 11.1299ZM12.1445 6.875C12.973 6.875 13.6445 7.54657 13.6445 8.375C13.6445 9.20343 12.973 9.875 12.1445 9.875C11.3161 9.875 10.6445 9.20343 10.6445 8.375C10.6445 7.54657 11.3161 6.875 12.1445 6.875Z" fill="#DEE2E6"/>
</svg>

After

Width:  |  Height:  |  Size: 974 B

File diff suppressed because one or more lines are too long

View File

@@ -6198,7 +6198,7 @@ button.swiper-pagination-bullet {
position: absolute;
display: none;
width: 100%;
background-color: #eeeeee;
background-color: #ffffff;
border: 0.1rem solid #cccccc;
}
.component-select.type-custom .option {
@@ -6262,9 +6262,9 @@ button.swiper-pagination-bullet {
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
background-color: #ffffff;
width: 100%;
position: absolute;
background-color: #eeeeee;
border: 1px solid #cccccc;
}
@media screen and (max-width: 1023px) {
@@ -6320,6 +6320,7 @@ button.swiper-pagination-bullet {
.component-select.bottom-sheet .select-options .option.current {
font-weight: 600;
color: #4bbc43;
background-color: #F9FDF9;
}
/* component tab */
@@ -7730,6 +7731,15 @@ button.swiper-pagination-bullet {
.footer .footer-menu ul li.menu-info.active {
background-image: url("../images/common/ico_menu_info_active.svg");
}
.footer .footer-menu ul li.menu-use {
background-image: url("../images/common/ico_menu_use.svg");
}
.footer .footer-menu ul li.menu-use.active {
background-image: url("../images/common/ico_menu_use_active.svg");
}
.footer .footer-menu ul li.menu-use.disabled {
background-image: url("../images/common/ico_menu_use_disabled.svg");
}
.footer .footer-menu ul li.active a {
color: #4bbc43;
}
@@ -8512,6 +8522,7 @@ button.swiper-pagination-bullet {
line-height: 140%;
color: #868e96;
word-break: break-all;
white-space: nowrap;
}
.regist-item-area .item-list .list-item .detail-list li p::before {
position: absolute;
@@ -9045,4 +9056,105 @@ button.swiper-pagination-bullet {
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.regi-wrap .month-detail {
border-image-outset: 0rem 0rem 6.4rem 0rem;
}
.regi-wrap .month-detail .tit {
padding-top: 3.2rem;
margin-bottom: 2rem;
font-size: 2rem;
line-height: 140%;
font-weight: 700;
}
.regi-wrap .month-detail .btn-column-list a {
padding: 0;
}
.regi-wrap .month-detail .btn-column-list .value li {
padding: 0;
box-shadow: none;
border: 0;
}
.regi-wrap .component-select.bottom-sheet {
width: -webkit-fit-content;
width: -moz-fit-content;
width: fit-content;
}
.regi-wrap .component-select.bottom-sheet::after {
display: none;
}
.regi-wrap .component-select.bottom-sheet .select-box {
position: relative;
padding: 0;
border: none;
border-radius: 0;
}
.regi-wrap .component-select.bottom-sheet .select-box::after {
position: absolute;
content: "";
display: block;
width: 3.2rem;
height: 3.2rem;
right: -4rem;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
background: url("../images/common/ico_cal_arrow_next.svg") center/contain no-repeat;
rotate: 90deg;
-webkit-transform-origin: top;
transform-origin: top;
}
.regi-wrap .component-select.bottom-sheet .select-box .select-txt {
font-size: 2.8rem;
line-height: 140%;
font-weight: 700;
}
.regi-wrap .month-filter {
padding: 3.2rem 0rem;
}
.regi-wrap .month-filter .summary {
display: -webkit-box;
display: -webkit-flex;
display: flex;
gap: 0.4rem;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
border-radius: 0.8rem;
overflow: hidden;
}
.regi-wrap .month-filter .summary li {
-webkit-box-flex: 1;
-webkit-flex: 1;
flex: 1;
padding: 1.6rem;
background-color: #f1faf0;
}
.regi-wrap .month-filter .summary li span {
color: #212529;
font-size: 1.6rem;
line-height: 140%;
}
.regi-wrap .month-filter .summary li p {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: end;
-webkit-justify-content: end;
justify-content: end;
margin-top: 1.2rem;
font-size: 1.6rem;
line-height: 140%;
color: #4bbc43;
text-align: right;
}
.regi-wrap .month-filter .summary li p strong {
margin-right: 0.2rem;
font-size: 2.8rem;
line-height: 140%;
font-weight: 700;
}
/*# sourceMappingURL=style.css.map */

View File

@@ -180,7 +180,7 @@ var ajaxUtil = {
if (formElement.length > 0) {
$(formElement).find('.component-input').removeClass('input-invalid');
$(formElement).find('.input-flex-group').removeClass('invalid');
$(formElement).find('.select-group').removeClass('input-invalid');
$(formElement).find('.select-group').removeClass('select-invalid');
$(formElement).find('.input-info').each(function () {
$(this).remove();
});
@@ -223,7 +223,7 @@ var ajaxUtil = {
infoBox = $('<ul class="input-info"></ul>').appendTo(component);
}
infoBox.html('<li>' + oj.message + '1111</li>');
infoBox.html('<li>' + oj.message + '</li>');
}
}
@@ -238,7 +238,10 @@ var ajaxUtil = {
// 포커스 이동
if ($('.input-invalid').length != 0) {
$('.input-invalid').eq(0).find('input,select').focus();
$('.input-invalid').eq(0).find('input').focus();
}
if ($('.select-invalid').length != 0) {
$('.select-invalid').eq(0).find('button').focus();
}
if (typeof errorCallback !== 'undefined') {

View File

@@ -172,7 +172,7 @@ kri.form.errorInit = function (formElement) {
if (formElement.length > 0) {
$(formElement).find('.component-input').removeClass('input-invalid');
$(formElement).find('.input-flex-group').removeClass('invalid');
$(formElement).find('.select-group').removeClass('select-invalid');
$(formElement).find('.select-group').removeClass('input-invalid');
$(formElement).find('.input-info').each(function () {
$(this).remove();
});
@@ -238,11 +238,12 @@ kri.form.error = function(errorList){
}
});
if(errorList && errorList.length > 0){
const target = $('[name="' + errorList[0].field + '"]');
if (target.length > 0) {
target.focus();
}
// 포커스 이동
if ($('.input-invalid').length != 0) {
$('.input-invalid').eq(0).find('input').focus();
}
if ($('.select-invalid').length != 0) {
$('.select-invalid').eq(0).find('button').focus();
}
}

View File

@@ -95,8 +95,6 @@ krip.daily.baseBindUI = function() {
//document.reqForm.todayNone.value = 'N';
$noneWrap.val('N');
}
// TODO 2번 이벤트 발생하는 원인 찾기
console.log(1111)
krip.daily.todayNone(ENV.month, ENV.groupNo, $noneWrap.data('type'), checked);
});

View File

@@ -26,16 +26,7 @@
<meta name="_csrf" th:content="${_csrf.token}"/>
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
<meta name="theme-color" content="#4BBC43">
<!-- 메인 아이콘 (512x512 PNG) -->
<!-- <link rel="icon" href="/icon-512.png" sizes="512x512"> -->
<link rel="icon" sizes="512x512"><!-- TODO : href="" -->
<!-- iOS 홈화면 -->
<!-- <link rel="apple-touch-icon" href="/icon-512.png"> -->
<link rel="apple-touch-icon"><!-- TODO : href="" -->
<!-- PWA -->
<link rel="manifest" ><!-- TODO : href="/manifest.json" -->
<link rel="icon" type="image/x-icon" /><!-- TODO : href="" -->
<!--/* TODO : theme-color */-->
<link th:href="@{/static/assets/styles/style.css}" type="text/css" rel="stylesheet" />
<script th:src="@{/static/assets/scripts/common.ui.plugin.js}"></script>
@@ -176,7 +167,7 @@
</li>
<!--/* TODO : 2차 오픈 s */-->
<li class="menu-regi disabled"><a href="javascript:void(0)">입력현황</a></li>
<li class="menu-stat disabled"><a href="javascript:void(0)">통계</a></li>
<li class="menu-use disabled"><a href="javascript:void(0)">이용안내</a></li>
<!--/* TODO : 2차 오픈 e */-->
<li class="menu-info"
th:classappend="${#strings.equals(currentURI?.uri, '/info')

View File

@@ -332,6 +332,7 @@
const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader');
const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length;
@@ -339,6 +340,7 @@
status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : '';
count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked;
@@ -369,7 +371,6 @@
errors.push({field: form.transferCategoryCode.value+"_value", message: '수입대상을 입력해주세요.'});
}
}
if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '수입원을 입력해주세요.'});
if(form.count.value){
if(!form.unitCode.value){
@@ -475,9 +476,6 @@
ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = '';
formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
},
});
},
@@ -533,10 +531,14 @@
: `${getCategory(categoryCode)}`;
let tagCount = '';
if(product.count && product.unitCode != "code.record.unit.self"){
tagCount = `<li><p>수량</p><span>${format(product.count)}${getUnit(product.unitCode)}</span></li>`;
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
? getUnit(product.unitCode)
: product.unit;
tagCount = `<li><p>수량</p><span>${format(product.count)}${unitText}</span></li>`;
} else {
tagCount = `<li><p>수량</p><span>${format(product.count)}${product.unit}</span></li>`
tagCount = '';
}
const buttonGroupHtml = isEdit
@@ -558,8 +560,12 @@
${buttonGroupHtml}
</div>
<ul class="detail-list">
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
<li><p>수입원</p><span>${product.sourcePurpose}</span></li>
${product.cropCode != null && product.cropCode != ''
? `<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>`
: ''}
${product.sourcePurpose != null && product.sourcePurpose != ''
? `<li><p>수입원</p><span>${product.sourcePurpose}</span></li>`
: ''}
${tagCount}
<li><p>현금</p><span>${format(product.price)}원</span></li>
</ul>

View File

@@ -86,12 +86,16 @@
<!-- transferCategory+Text-->
<th:block th:each="item : ${transferCategoryList}">
<div class="component-input " th:data-option="${item.codeText}">
<div class="input-field">
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'" value="" placeholder="수입 대상을 입력해 주세요." maxlength="30">
<div class="input-field" th:if="${item.id != 'code.bank.input.10' and item.id != 'code.bank.input.12' and item.id != 'code.bank.input.13'}">
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'"
value="" maxlength="30"
th:placeholder="${item.id == 'code.bank.input.self' ? '수입의 종류를 입력해 주세요.' : '수입 대상을 입력해 주세요.'}">
</div>
<th:block th:if="${item.id == 'code.bank.input.1' or item.id == 'code.bank.input.4'}">
<ul class="guide-info" th:if="${item.msgCode}">
<li class="txt-blue" th:text="${item.msgCode}"></li>
</ul>
</th:block>
</div>
</th:block>
</div>
@@ -100,7 +104,6 @@
<div class="input-label">
<label for="sourcePurpose" class="label-txt">
수입원
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">

View File

@@ -323,6 +323,7 @@
const next = document.getElementById('complateBtn');
const header = document.getElementById('listHeader');
const count = document.getElementById('listCount');
const totalItems = document.getElementById('totalItems');
const total = ENV.data.bankList.length;
@@ -330,6 +331,7 @@
status.style.display = total > 0 ? 'none' : '';
callPastInfoBtn.style.display = total > 0 ? 'none' : '';
count.textContent = total;
totalItems.textContent = total;
btn.disabled = isChecked;
@@ -361,7 +363,6 @@
}
}
if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '용도 입력해주세요.'});
if(form.count.value){
if(!form.unitCode.value){
errors.push({
@@ -469,9 +470,6 @@
ENV.data.bankList = [];
document.getElementById('listBody').innerHTML = '';
formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.bankList.length;
},
});
},
@@ -526,10 +524,14 @@
: `${getCategory(categoryCode)}`;
let tagCount = '';
if(product.count && product.unitCode != "code.record.unit.self"){
tagCount = `<li><p>수량</p><span>${format(product.count)}${getUnit(product.unitCode)}</span></li>`;
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
? getUnit(product.unitCode)
: product.unit;
tagCount = `<li><p>수량</p><span>${format(product.count)}${unitText}</span></li>`;
} else {
tagCount = `<li><p>수량</p><span>${format(product.count)}${product.unit}</span></li>`
tagCount = '';
}
const buttonGroupHtml = isEdit
@@ -552,7 +554,9 @@
${buttonGroupHtml}
</div>
<ul class="detail-list">
<li><p>용도</p><span>${product.sourcePurpose}</span></li>
${product.sourcePurpose != null && product.sourcePurpose != ''
? `<li><p>용도</p><span>${product.sourcePurpose}</span></li>`
: ''}
${tagCount}
<li><p>현금</p><span>${format(product.price)}원</span></li>
</ul>

View File

@@ -63,7 +63,6 @@
<div class="input-label">
<label for="sourcePurpose" class="label-txt">
용도
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">

View File

@@ -93,7 +93,7 @@
</p>
</div>
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>

View File

@@ -20,7 +20,7 @@
<strong>지출 내역 [[${#lists.isEmpty(expenseList) ? 0 : #lists.size(expenseList)}]]건 등록</strong> <br>
되었습니다.
</h3>
<p th:if="${#lists.isEmpty(expenseList)}">지출 내역을 등록해 주세요..</p>
<p th:if="${#lists.isEmpty(expenseList)}">지출 내역을 등록해 주세요.</p>
<p th:unless="${#lists.isEmpty(expenseList)}">등록 내용을 확인하거나 다음 단계로 이동하세요.</p>
</hgroup>
@@ -140,10 +140,6 @@
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
$(function() {
formControl.init();
});
let ENV = {
httpUrl: {
root: /*[[|/record/daily/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',

View File

@@ -16,7 +16,7 @@
</p>
</div>
<div id="productCode" class="component-select bottom-sheet" data-props-default="생산물을 선택해 주세요" data-props-type="bottomSheet">
<input type="hidden" name="productCode" th:value="${detail.productCode}">
<input type="hidden" name="productCode" data-type="select" th:value="${detail.productCode}">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>
@@ -80,7 +80,7 @@
</p>
</div>
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>

View File

@@ -3,19 +3,11 @@
xmlns:th="http://www.thymeleaf.org" lang="ko">
<div layout:fragment="content" th:classappend="acco-wrap">
[[${dailyRecord.registrable}]]
[[${moveStep}]],
[[${dailyRecord.modifiable}]]
--
[[${(not dailyRecord.modifiable)}]]
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
, btnDisabled=${(not btnActive)
|| #strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}
, btnIcoClass=${btnDisabled ? 'ico-add-disabled' : 'ico-add'}">
[[${btnActive}]], [[${btnDisabled}]], [[${btnIcoClass}]]
<div class="inner">
<hgroup class="tit-group">
<h3>
@@ -151,10 +143,6 @@
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
$(function() {
formControl.init();
});
let ENV = {
httpUrl: {
root: /*[[|/record/farming/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',

View File

@@ -55,7 +55,7 @@
</p>
</div>
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>

View File

@@ -143,10 +143,6 @@
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
$(function() {
formControl.init();
});
let ENV = {
httpUrl: {
root: /*[[|/record/forestry/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',

View File

@@ -123,7 +123,7 @@
</p>
</div>
<div id="unitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요" data-props-type="bottomSheet">
<input type="hidden" name="unitCode" th:value="${detail.unitCode}">
<input type="hidden" name="unitCode" data-type="select" th:value="${detail.unitCode}">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>

View File

@@ -10,13 +10,6 @@
<div>
detail: [[${dailyRecord}]]
</div>
<div>
[[${dailyRecord.registrable}]]
[[${moveStep}]],
[[${dailyRecord.modifiable}]]
<br>
//http://localhost:8080/record/income/202505/12?type=step1&target=income
</div>
</th:block>
<main id="content" role="main"
th:with="btnActive=${(dailyRecord.registrable && moveStep) || dailyRecord.modifiable }
@@ -162,10 +155,6 @@
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
$(function() {
formControl.init();
});
let ENV = {
httpUrl: {
root: /*[[|/record/daily/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',

View File

@@ -128,10 +128,6 @@
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
$(function() {
formControl.init();
});
let ENV = {
httpUrl: {
root: /*[[|/record/power/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',

View File

@@ -66,7 +66,7 @@
</div>
<div id="areaUnitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요"
data-props-type="bottomSheet">
<input type="hidden" name="areaUnitCode" th:value="${detail.areaUnitCode}">
<input type="hidden" name="areaUnitCode" data-type="select" th:value="${detail.areaUnitCode}">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>
@@ -104,7 +104,6 @@
<div class="input-label">
<label for="harvestQuantity" class="label-txt">
수확량
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">
@@ -120,7 +119,7 @@
</div>
<div id="harvestUnitCode" class="component-select bottom-sheet" data-props-default="단위를 선택해 주세요"
data-props-type="bottomSheet">
<input type="hidden" name="harvestUnitCode" th:value="${detail.harvestUnitCode}">
<input type="hidden" name="harvestUnitCode" data-type="select" th:value="${detail.harvestUnitCode}">
<button type="button" class="select-box">
<span class="select-txt"></span>
</button>

View File

@@ -189,10 +189,6 @@
<section layout:fragment="script">
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
$(function() {
formControl.init();
});
let ENV = {
httpUrl: {
root: /*[[|/record/work/${reqVO.searchMonth}/${reqVO.groupNo}|]]*/'rootUrl',

View File

@@ -35,7 +35,7 @@
</label>
</div>
<div class="input-field">
<input type="password" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요" maxlength="4">
<input type="password" inputmode="numeric" maxlength="4" name="password" id="floatingPassword" placeholder="비밀번호 4자리를 입력해 주세요">
</div>
<ul class="input-info" id="password-error" style="display: none;">
<li>비밀번호를 입력해주세요</li>