Commit 3b875d1f by Kang Donghun

Add reset to search terms, translate Korean lang.json, and clean up code

parent 5f63946e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header bg-dark10"> <div class="modal-header bg-dark10">
<h5 class="modal-title lang" lang="confirmation"></h5> <h5 class="modal-title lang" lang="confirmation" id="modalTitle"></h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
......
...@@ -79,38 +79,38 @@ ...@@ -79,38 +79,38 @@
"sendDate":"송신일시", "sendDate":"송신일시",
"sender":"송신자", "sender":"송신자",
"content":"내용", "content":"내용",
"buttonOperationSelect":"Operation", "buttonOperationSelect":"작업",
"labelSendTypeTitle":"Type", "labelSendTypeTitle":"타입",
"labelSendTypeGroup":"Group", "labelSendTypeGroup":"그룹",
"labelSendTypeAll":"All", "labelSendTypeAll":"전체",
"txtMessageContent":"Message", "txtMessageContent":"메시지",
"buttonTemplateSelection":"Template", "buttonTemplateSelection":"정형문",
"buttonSend":"Send", "buttonSend":"전송",
"msgContentRequired":"Content is required", "msgContentRequired":"전송할 내용이 없습니다.",
"msgContentInvalidLength":"The content length exceeds the maximum of {0} characters", "msgContentInvalidLength":"최대 전송 가능한 메시지 글자 수는 {0} 자입니다.",
"msgOperationRequired":"Operation is required", "msgOperationRequired":"작업을 선택되지 않았습니다.",
"msgSendTypeRequired":"Send type is required", "msgSendTypeRequired":"전송할 타입이 선택되지 않았습니다.",
"operationSelection":"Operation select", "operationSelection":"작업 선택",
"selection":"Selection", "selection":"선택",
"templateSelection":"Template selection", "templateSelection":"정형문 선택",
"logo":"logo", "logo":"로고",
"listDisplay":"list display", "listDisplay":"일람 표시",
"gridDisplay":"Grid display", "gridDisplay":"그리드 표시",
"operationListSearchPlacehoder":"Operation Name", "operationListSearchPlacehoder":"작업명",
"searchIcon":"Search Icon", "searchIcon":"검색",
"category":"Category", "category":"카테고리",
"term":"Term", "term":"기간",
"searchClear":"Search Clear", "searchClear":"검색 초기화",
"calendar":"Calendar", "calendar":"달력",
"startDate":"Start Date", "startDate":"개시일",
"endDate":"End Date", "endDate":"종료일",
"sortBy":"Sort By", "sortBy":"정렬",
"sortByName":"Name", "sortByName":"작업명",
"sortByStartDate":"Start Date", "sortByStartDate":"개시일",
"sortByEndDate":"End Date", "sortByEndDate":"종료일",
"sortByLastEdit":"Last Edit", "sortByLastEdit":"최근 수정일",
"categorySelection":"Category Selection", "categorySelection":"카테고리 선택",
"categoryAll":"All", "categoryAll":"전체",
"reportForm": "보고서", "reportForm": "보고서",
"periodicInspectionPeriod": "정기점검기간", "periodicInspectionPeriod": "정기점검기간",
"msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.", "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
......
...@@ -129,6 +129,7 @@ DASHBOARD.init = function () { ...@@ -129,6 +129,7 @@ DASHBOARD.init = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
sessionStorage.removeItem("operationId"); sessionStorage.removeItem("operationId");
sessionStorage.removeItem("RL_searchWord");
DASHBOARD.loadCommon(); DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) { DASHBOARD.getDashboardData(function (dataDashboard) {
......
...@@ -24,6 +24,7 @@ OL.init = function () { ...@@ -24,6 +24,7 @@ OL.init = function () {
console.log('OperationList start'); console.log('OperationList start');
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST; sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
sessionStorage.removeItem("operationId"); sessionStorage.removeItem("operationId");
sessionStorage.removeItem("RL_searchWord");
TEMPLATE.loadHeader('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
......
...@@ -29,6 +29,9 @@ RL.loadCommon = function () { ...@@ -29,6 +29,9 @@ RL.loadCommon = function () {
}; };
/**
* create breadcrumb menu on ReportList
*/
RL.initBreadcrumb = function () { RL.initBreadcrumb = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) { if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
navs = [ navs = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment