Merge branch 'susu' into dev
This commit is contained in:
@@ -4,6 +4,7 @@ import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class LocalRegionResearcherPercentDto {
|
||||
private Long seq;
|
||||
private String researcherName;
|
||||
private String regionMainCodeName;
|
||||
private Double totalHouseholdCount;
|
||||
|
||||
@@ -81,6 +81,7 @@
|
||||
|
||||
<select id="selectLocalRegionResearcherPercentage">
|
||||
SELECT
|
||||
a.seq,
|
||||
NULLIF(a.name,'-') AS researcher_name,
|
||||
u.code_text AS region_main_code_name,
|
||||
COUNT(DISTINCT h.seq) AS total_household_count,
|
||||
|
||||
@@ -128,7 +128,7 @@
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<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>
|
||||
</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:th="http://www.thymeleaf.org">
|
||||
|
||||
<section layout:fragment="content" th:unless="${activeProfile != 'local'}">
|
||||
<section layout:fragment="content">
|
||||
<div class="d-flex-tit">
|
||||
<hgroup class="page-tit-group">
|
||||
<h2 class="page-tit" id="recordMonthText">
|
||||
@@ -274,7 +274,7 @@
|
||||
`
|
||||
<tr>
|
||||
<td>
|
||||
<a href="">${ct.researcherName}</a>
|
||||
<a href="/researcher/${ct.seq}">${ct.researcherName}</a>
|
||||
</td>
|
||||
<td>${ct.regionMainCodeName}</td>
|
||||
<td>${ct.totalHouseholdCount}</td>
|
||||
@@ -347,7 +347,7 @@
|
||||
`
|
||||
<tr>
|
||||
<td>
|
||||
<a href="">${ct.researcherName}</a>
|
||||
<a href="/researcher/${ct.seq}">${ct.researcherName}</a>
|
||||
</td>
|
||||
<td>${ct.regionMainCodeName}</td>
|
||||
<td>${ct.totalHouseholdCount}</td>
|
||||
@@ -405,9 +405,9 @@
|
||||
const activeProfile = '[[${activeProfile}]]';
|
||||
// 페이지 로드 시 호출
|
||||
$(document).ready(function() {
|
||||
if(activeProfile === 'local'){
|
||||
getTotalPercentage();
|
||||
}
|
||||
|
||||
getTotalPercentage();
|
||||
|
||||
$('#usageType').change(function() {
|
||||
getTotalPercentage();
|
||||
});
|
||||
|
||||
@@ -270,10 +270,10 @@
|
||||
|
||||
<div class="component-btns bottom-btn-group">
|
||||
<div class="btns-row align-right">
|
||||
<button type="button" class="btn" onclick="showExcelHouseholdModal();" th:unless="${activeProfile != 'local'}">
|
||||
<span class="btn-txt">엑셀 업로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
||||
<button type="button" class="btn" onclick="showExcelHouseholdModal();" >
|
||||
<span class="btn-txt">엑셀 업로드</span>
|
||||
</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>
|
||||
</button>
|
||||
<!-- 관리자만 노출 -->
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
<input type="hidden" name="currentMonth" th:value="${currentMonth}">
|
||||
<input type="hidden" name="isPaging">
|
||||
|
||||
<div class="component-tab" data-active="none">
|
||||
<div class="component-tab" data-active="tab1">
|
||||
<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-visit" data-tab-value="tab2">임가방문정보</button>
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
<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">
|
||||
<button type="button" class="btn" onclick="goExcel();">
|
||||
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
<input type="checkbox" name="todayNone"
|
||||
data-type="EXPENSE"
|
||||
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-txt">금일 등록내용 없음</span>
|
||||
</span>
|
||||
@@ -466,6 +467,23 @@
|
||||
|
||||
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>
|
||||
</section>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
<input type="checkbox" name="todayNone"
|
||||
data-type="FARMING"
|
||||
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-txt">금일 등록내용 없음</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>
|
||||
</section>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
<input type="checkbox" name="todayNone"
|
||||
data-type="FORESTRY"
|
||||
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-txt">금일 등록내용 없음</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>
|
||||
</section>
|
||||
|
||||
@@ -45,7 +45,8 @@
|
||||
<input type="checkbox" name="todayNone"
|
||||
data-type="INCOME"
|
||||
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-txt">금일 등록내용 없음</span>
|
||||
</span>
|
||||
@@ -525,7 +526,23 @@
|
||||
|
||||
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>
|
||||
</section>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
<input type="checkbox" name="todayNone"
|
||||
data-type="POWER"
|
||||
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-txt">금일 등록내용 없음</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>
|
||||
</section>
|
||||
|
||||
@@ -36,7 +36,8 @@
|
||||
<input type="checkbox" name="todayNone"
|
||||
data-type="WORK"
|
||||
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-txt">금일 등록내용 없음</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>
|
||||
</section>
|
||||
|
||||
Reference in New Issue
Block a user