Merge branch 'dev' into deploy-dev-admin
This commit is contained in:
@@ -51,7 +51,7 @@ public class AdminUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AdminUser user = (AdminUser) authentication.getPrincipal();
|
AdminUser user = (AdminUser) authentication.getPrincipal();
|
||||||
return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode();
|
return user.getRegionMainCode() == null ? null : user.getRegionMainCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getLoginUserLastIp() {
|
public static String getLoginUserLastIp() {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import lombok.Data;
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class LocalRegionResearcherPercentDto {
|
public class LocalRegionResearcherPercentDto {
|
||||||
|
private Long seq;
|
||||||
private String researcherName;
|
private String researcherName;
|
||||||
private String regionMainCodeName;
|
private String regionMainCodeName;
|
||||||
private Double totalHouseholdCount;
|
private Double totalHouseholdCount;
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ class GetHouseholdsStatusController {
|
|||||||
reqVO.getResearcherValue(),
|
reqVO.getResearcherValue(),
|
||||||
reqVO.getIsPanel(),
|
reqVO.getIsPanel(),
|
||||||
AdminUtil.getLoginUserSeq(),
|
AdminUtil.getLoginUserSeq(),
|
||||||
reqVO.getUserRole(),
|
AdminUtil.getLoginUserRole(),
|
||||||
reqVO.getUserRegionMainCode(),
|
AdminUtil.getLoginUserRegionMainCode(),
|
||||||
Boolean.TRUE)));
|
Boolean.TRUE)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -41,8 +41,4 @@ public class GetHouseholdsStatusReqVO {
|
|||||||
private String researcherValue;
|
private String researcherValue;
|
||||||
// 패널 유지 여부
|
// 패널 유지 여부
|
||||||
private Boolean isPanel;
|
private Boolean isPanel;
|
||||||
// 로그인한 유저 역할
|
|
||||||
private String userRole;
|
|
||||||
// 로그인한 유저 실사 지역
|
|
||||||
private String userRegionMainCode;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,7 +69,7 @@
|
|||||||
and h.usage_type = #{usageType}
|
and h.usage_type = #{usageType}
|
||||||
</if>
|
</if>
|
||||||
LEFT JOIN household_visit hv
|
LEFT JOIN household_visit hv
|
||||||
ON hv.household_seq = h.seq AND hv.is_deleted = false
|
ON hv.household_seq = h.seq AND hv.is_deleted = false AND to_char(hv.visit_date,'YYYYMM') = #{recordMonth}
|
||||||
LEFT JOIN v_monthly_completion_rate v
|
LEFT JOIN v_monthly_completion_rate v
|
||||||
ON v.household_seq = h.seq AND v.record_month = #{recordMonth}
|
ON v.household_seq = h.seq AND v.record_month = #{recordMonth}
|
||||||
WHERE u.parent_id = 'code.region.main' and u.in_use = true
|
WHERE u.parent_id = 'code.region.main' and u.in_use = true
|
||||||
@@ -81,6 +81,7 @@
|
|||||||
|
|
||||||
<select id="selectLocalRegionResearcherPercentage">
|
<select id="selectLocalRegionResearcherPercentage">
|
||||||
SELECT
|
SELECT
|
||||||
|
a.seq,
|
||||||
NULLIF(a.name,'-') AS researcher_name,
|
NULLIF(a.name,'-') AS researcher_name,
|
||||||
u.code_text AS region_main_code_name,
|
u.code_text AS region_main_code_name,
|
||||||
COUNT(DISTINCT h.seq) AS total_household_count,
|
COUNT(DISTINCT h.seq) AS total_household_count,
|
||||||
|
|||||||
@@ -128,7 +128,7 @@
|
|||||||
|
|
||||||
<div class="component-btns bottom-btn-group">
|
<div class="component-btns bottom-btn-group">
|
||||||
<div class="btns-row align-right">
|
<div class="btns-row align-right">
|
||||||
<button class="btn" onclick="showAdminExcelUploadModal();" type="button" th:unless="${activeProfile != 'local'}">
|
<button class="btn" onclick="showAdminExcelUploadModal();" type="button">
|
||||||
<span class="btn-txt">엑셀 업로드</span>
|
<span class="btn-txt">엑셀 업로드</span>
|
||||||
</button>
|
</button>
|
||||||
<!-- <button class="btn" onclick="goExcel();" type="button"><span class="btn-txt" th:unless="${activeProfile != 'local'}">엑셀 다운로드</span></button>-->
|
<!-- <button class="btn" onclick="goExcel();" type="button"><span class="btn-txt" th:unless="${activeProfile != 'local'}">엑셀 다운로드</span></button>-->
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
xmlns:sec="http://www.w3.org/1999/xhtml"
|
xmlns:sec="http://www.w3.org/1999/xhtml"
|
||||||
xmlns:th="http://www.thymeleaf.org">
|
xmlns:th="http://www.thymeleaf.org">
|
||||||
|
|
||||||
<section layout:fragment="content" th:unless="${activeProfile != 'local'}">
|
<section layout:fragment="content">
|
||||||
<div class="d-flex-tit">
|
<div class="d-flex-tit">
|
||||||
<hgroup class="page-tit-group">
|
<hgroup class="page-tit-group">
|
||||||
<h2 class="page-tit" id="recordMonthText">
|
<h2 class="page-tit" id="recordMonthText">
|
||||||
@@ -274,7 +274,7 @@
|
|||||||
`
|
`
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<a href="">${ct.researcherName}</a>
|
<a href="/researcher/${ct.seq}">${ct.researcherName}</a>
|
||||||
</td>
|
</td>
|
||||||
<td>${ct.regionMainCodeName}</td>
|
<td>${ct.regionMainCodeName}</td>
|
||||||
<td>${ct.totalHouseholdCount}</td>
|
<td>${ct.totalHouseholdCount}</td>
|
||||||
@@ -347,7 +347,7 @@
|
|||||||
`
|
`
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<a href="">${ct.researcherName}</a>
|
<a href="/researcher/${ct.seq}">${ct.researcherName}</a>
|
||||||
</td>
|
</td>
|
||||||
<td>${ct.regionMainCodeName}</td>
|
<td>${ct.regionMainCodeName}</td>
|
||||||
<td>${ct.totalHouseholdCount}</td>
|
<td>${ct.totalHouseholdCount}</td>
|
||||||
@@ -405,9 +405,9 @@
|
|||||||
const activeProfile = '[[${activeProfile}]]';
|
const activeProfile = '[[${activeProfile}]]';
|
||||||
// 페이지 로드 시 호출
|
// 페이지 로드 시 호출
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
if(activeProfile === 'local'){
|
|
||||||
getTotalPercentage();
|
getTotalPercentage();
|
||||||
}
|
|
||||||
$('#usageType').change(function() {
|
$('#usageType').change(function() {
|
||||||
getTotalPercentage();
|
getTotalPercentage();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -9,9 +9,6 @@
|
|||||||
<input name="page" th:field="*{page}" type="hidden"/>
|
<input name="page" th:field="*{page}" type="hidden"/>
|
||||||
<input name="size" th:field="*{size}" type="hidden"/>
|
<input name="size" th:field="*{size}" type="hidden"/>
|
||||||
|
|
||||||
<input name="userRole" th:value="${userRole}" type="hidden"/>
|
|
||||||
<input name="userRegionMainCode" th:value="${userRegionMainCode}" type="hidden"/>
|
|
||||||
|
|
||||||
<div class="content-inner">
|
<div class="content-inner">
|
||||||
<!-- 필터 영역 -->
|
<!-- 필터 영역 -->
|
||||||
<section class="filter-wrap">
|
<section class="filter-wrap">
|
||||||
@@ -270,10 +267,10 @@
|
|||||||
|
|
||||||
<div class="component-btns bottom-btn-group">
|
<div class="component-btns bottom-btn-group">
|
||||||
<div class="btns-row align-right">
|
<div class="btns-row align-right">
|
||||||
<button type="button" class="btn" onclick="showExcelHouseholdModal();" th:unless="${activeProfile != 'local'}">
|
<button type="button" class="btn" onclick="showExcelHouseholdModal();" >
|
||||||
<span class="btn-txt">엑셀 업로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
<span class="btn-txt">엑셀 업로드</span>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn" onclick="showExcelDownloadModal();" th:unless="${activeProfile != 'local'}">
|
<button type="button" class="btn" onclick="showExcelDownloadModal();">
|
||||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
||||||
</button>
|
</button>
|
||||||
<!-- 관리자만 노출 -->
|
<!-- 관리자만 노출 -->
|
||||||
@@ -305,6 +302,8 @@
|
|||||||
const selectedIndustryLargeCode = /*[[${reqVO.industryLargeCode}]]*/ '';
|
const selectedIndustryLargeCode = /*[[${reqVO.industryLargeCode}]]*/ '';
|
||||||
const selectedIndustryMiddleCode= /*[[${reqVO.industryMiddleCode}]]*/ '';
|
const selectedIndustryMiddleCode= /*[[${reqVO.industryMiddleCode}]]*/ '';
|
||||||
|
|
||||||
|
const userRole = /*[[${userRole}]]*/ '';
|
||||||
|
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
// 지역, 세부지역 셀렉트박스 세팅
|
// 지역, 세부지역 셀렉트박스 세팅
|
||||||
setSelectBoxUiCode({
|
setSelectBoxUiCode({
|
||||||
@@ -382,7 +381,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// 현재 로그인한 유저의 역할
|
// 현재 로그인한 유저의 역할
|
||||||
const isResearcher = f.userRole.value === 'ROLE_RESEARCHER';
|
const isResearcher = userRole === 'ROLE_RESEARCHER';
|
||||||
const colspanLength = isResearcher ? 13 : 15;
|
const colspanLength = isResearcher ? 13 : 15;
|
||||||
|
|
||||||
// 조사원일 경우 조사원이름, 번호 칼럼 hide
|
// 조사원일 경우 조사원이름, 번호 칼럼 hide
|
||||||
|
|||||||
@@ -476,7 +476,7 @@
|
|||||||
if (response.monthlyCarryOver != null) {
|
if (response.monthlyCarryOver != null) {
|
||||||
$('#carryOver').text(Number(response.monthlyCarryOver).toLocaleString() + '원');
|
$('#carryOver').text(Number(response.monthlyCarryOver).toLocaleString() + '원');
|
||||||
} else {
|
} else {
|
||||||
$('#carryOver').text('계산중입니다.');
|
$('#carryOver').text('정산중입니다.');
|
||||||
}
|
}
|
||||||
$('._monthlyCarryOver').show();
|
$('._monthlyCarryOver').show();
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -252,7 +252,7 @@
|
|||||||
let $tab = $('.component-tab button[data-tab-value="' + tabActive + '"]');
|
let $tab = $('.component-tab button[data-tab-value="' + tabActive + '"]');
|
||||||
|
|
||||||
getTabData($tab.data('tabType'), $tab.data('tabValue'));
|
getTabData($tab.data('tabType'), $tab.data('tabValue'));
|
||||||
}, 100);
|
}, 500);
|
||||||
});
|
});
|
||||||
|
|
||||||
$('.select-tab').on('click', function () {
|
$('.select-tab').on('click', function () {
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
<input type="hidden" name="currentMonth" th:value="${currentMonth}">
|
<input type="hidden" name="currentMonth" th:value="${currentMonth}">
|
||||||
<input type="hidden" name="isPaging">
|
<input type="hidden" name="isPaging">
|
||||||
|
|
||||||
<div class="component-tab" data-active="none">
|
<div class="component-tab" data-active="tab1">
|
||||||
<div class="tab-head">
|
<div class="tab-head">
|
||||||
<button type="button" class="tab-label" data-tab-type="household" data-tab-value="tab1">담당 임가 목록</button>
|
<button type="button" class="tab-label" data-tab-type="household" data-tab-value="tab1">담당 임가 목록</button>
|
||||||
<button type="button" class="tab-label" data-tab-type="household-visit" data-tab-value="tab2">임가방문정보</button>
|
<button type="button" class="tab-label" data-tab-type="household-visit" data-tab-value="tab2">임가방문정보</button>
|
||||||
@@ -77,7 +77,7 @@
|
|||||||
<input name="adminSeq" th:field="${researcherDto.seq}" type="hidden"/>
|
<input name="adminSeq" th:field="${researcherDto.seq}" type="hidden"/>
|
||||||
|
|
||||||
<div class="tab-body">
|
<div class="tab-body">
|
||||||
<div class="tab-content" data-tab-value="tab1">
|
<div class="tab-content" data-tab-value="none">
|
||||||
<div class="content-inner">
|
<div class="content-inner">
|
||||||
<section class="table-group">
|
<section class="table-group">
|
||||||
<div class="table-tit-group">
|
<div class="table-tit-group">
|
||||||
@@ -236,7 +236,7 @@
|
|||||||
let $tab = $('.component-tab button[data-tab-value="' + tabActive + '"]');
|
let $tab = $('.component-tab button[data-tab-value="' + tabActive + '"]');
|
||||||
|
|
||||||
getTabData($tab.data('tabType'), $tab.data('tabValue'));
|
getTabData($tab.data('tabType'), $tab.data('tabValue'));
|
||||||
}, 100);
|
}, 500);
|
||||||
});
|
});
|
||||||
|
|
||||||
const getTabData = (tabType, tabValue) => {
|
const getTabData = (tabType, tabValue) => {
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
|
|
||||||
<div class="row paging"></div>
|
<div class="row paging"></div>
|
||||||
|
|
||||||
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
|
<div class="component-btns bottom-btn-group" >
|
||||||
<div class="btns-row align-right">
|
<div class="btns-row align-right">
|
||||||
<button type="button" class="btn" onclick="goExcel();">
|
<button type="button" class="btn" onclick="goExcel();">
|
||||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
||||||
|
|||||||
@@ -59,9 +59,7 @@
|
|||||||
<div class="detail-tit-area">
|
<div class="detail-tit-area">
|
||||||
<p class="tit">일계부 등록 기본</p>
|
<p class="tit">일계부 등록 기본</p>
|
||||||
</div>
|
</div>
|
||||||
<span class="deatil-txt">
|
<span class="deatil-txt"></span>
|
||||||
|
|
||||||
</span>
|
|
||||||
<div class="detail-step">
|
<div class="detail-step">
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
|
|||||||
@@ -915,7 +915,7 @@
|
|||||||
<li>
|
<li>
|
||||||
<p class="label">월초이월금</p>
|
<p class="label">월초이월금</p>
|
||||||
{{if carryOver == null}}
|
{{if carryOver == null}}
|
||||||
<p class="value">계산중입니다.</p>
|
<p class="value">정산중입니다.</p>
|
||||||
{{else}}
|
{{else}}
|
||||||
<p class="value"><em><b>{{:carryOver}}</b> 원</em></p>
|
<p class="value"><em><b>{{:carryOver}}</b> 원</em></p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="EXPENSE"
|
data-type="EXPENSE"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.expenseStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"
|
||||||
|
onchange="modalControl.showTodayNoneAlert(this)">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -466,6 +467,23 @@
|
|||||||
|
|
||||||
ajaxUtil._hideWaiting();
|
ajaxUtil._hideWaiting();
|
||||||
},
|
},
|
||||||
|
showTodayNoneAlert(checkbox){
|
||||||
|
if (checkbox.checked) {
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '금일 등록내용 없음을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '등록을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="FARMING"
|
data-type="FARMING"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.farmingStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"
|
||||||
|
onchange="modalControl.showTodayNoneAlert(this)">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -216,6 +217,23 @@
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
showTodayNoneAlert(checkbox){
|
||||||
|
if (checkbox.checked) {
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '금일 등록내용 없음을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '등록을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="FORESTRY"
|
data-type="FORESTRY"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.forestryStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"
|
||||||
|
onchange="modalControl.showTodayNoneAlert(this)">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -204,6 +205,23 @@
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
showTodayNoneAlert(checkbox){
|
||||||
|
if (checkbox.checked) {
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '금일 등록내용 없음을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '등록을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -45,7 +45,8 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="INCOME"
|
data-type="INCOME"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.incomeStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"
|
||||||
|
onchange="modalControl.showTodayNoneAlert(this)">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -525,7 +526,23 @@
|
|||||||
|
|
||||||
ajaxUtil._hideWaiting();
|
ajaxUtil._hideWaiting();
|
||||||
},
|
},
|
||||||
|
showTodayNoneAlert(checkbox){
|
||||||
|
if (checkbox.checked) {
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '금일 등록내용 없음을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '등록을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="POWER"
|
data-type="POWER"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.powerStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"
|
||||||
|
onchange="modalControl.showTodayNoneAlert(this)">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -205,6 +206,23 @@
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
showTodayNoneAlert(checkbox){
|
||||||
|
if (checkbox.checked) {
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '금일 등록내용 없음을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '등록을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
<input type="checkbox" name="todayNone"
|
<input type="checkbox" name="todayNone"
|
||||||
data-type="WORK"
|
data-type="WORK"
|
||||||
th:disabled="${not btnActive}"
|
th:disabled="${not btnActive}"
|
||||||
th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}">
|
th:checked="${#strings.equals(dailyRecord.workStatus, T(app.module.core.config.application.enums.DailyTargetStatus).TODAY_NONE)}"
|
||||||
|
onchange="modalControl.showTodayNoneAlert(this)">
|
||||||
<span class="checkbox-item">
|
<span class="checkbox-item">
|
||||||
<span class="checkbox-txt">금일 등록내용 없음</span>
|
<span class="checkbox-txt">금일 등록내용 없음</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -266,6 +267,23 @@
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
showTodayNoneAlert(checkbox){
|
||||||
|
if (checkbox.checked) {
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '금일 등록내용 없음을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
etUI.dialog.alert({
|
||||||
|
message: '등록을 선택하셨습니다.',
|
||||||
|
type: 'alert',
|
||||||
|
callback: function () {
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
Reference in New Issue
Block a user