Commit 6278daf0 by Kang Donghun

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web'

Feature/1.0 check web dev

See merge request !127
parents 39f76b03 1fa5ad10
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
"txtLoginDate":"Login Date", "txtLoginDate":"Login Date",
"accountInformation":"Account Information", "accountInformation":"Account Information",
"errorOccurred": "Error Occurred", "errorOccurred": "Error Occurred",
"onlyPrintCms": "This I/O report can be output from only Administration screens.",
"msgLogoutConfirm": "Do you want to Logout?", "msgLogoutConfirm": "Do you want to Logout?",
"msgEssential": "{0} is required", "msgEssential": "{0} is required",
"pdfPrint":"PDF Print", "pdfPrint":"PDF Print",
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
"txtLoginDate":"ログイン日時", "txtLoginDate":"ログイン日時",
"accountInformation":"アカウント情報", "accountInformation":"アカウント情報",
"errorOccurred": "エラーが発生しました", "errorOccurred": "エラーが発生しました",
"onlyPrintCms": "この帳票は管理画面からのみ出力できます。",
"msgLogoutConfirm": "ログアウトしますか?", "msgLogoutConfirm": "ログアウトしますか?",
"msgEssential": "{0}は必須です。", "msgEssential": "{0}は必須です。",
"pdfPrint":"PDF出力", "pdfPrint":"PDF出力",
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
"txtLoginDate":"로그인 일시", "txtLoginDate":"로그인 일시",
"accountInformation":"계정 정보", "accountInformation":"계정 정보",
"errorOccurred": "오류가 발생했습니다", "errorOccurred": "오류가 발생했습니다",
"onlyPrintCms": "해당 IO장표는 관리화면에서만 출력 가능합니다.",
"msgLogoutConfirm": "로그아웃 하시겠습니까?", "msgLogoutConfirm": "로그아웃 하시겠습니까?",
"pdfPrint":"PDF 출력", "pdfPrint":"PDF 출력",
"msgOperationEmpty": "작업 데이터가 없습니다.", "msgOperationEmpty": "작업 데이터가 없습니다.",
......
...@@ -7,20 +7,24 @@ ...@@ -7,20 +7,24 @@
var RL = {}; var RL = {};
RL.isQuickReport; RL.isQuickReport;
RL.isQRTableInspect;
/** /**
* init * init
*/ */
RL.init = function () { RL.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.showLoading(); COMMON.showLoading();
COMMON.checkAuth(false); COMMON.checkAuth(false);
COMMON.checkQuickReport(function(result) { COMMON.checkQuickReport(function(result) {
if (result) RL.isQuickReport = result.isQuickReport; if (result) {
} ); RL.isQuickReport = result.isQuickReport;
RL.loadCommon(); RL.isQRTableInspect = result.isQRTableInspect;
RL.initTaskReportList(); };
COMMON.closeLoading(); });
RL.loadCommon();
RL.initTaskReportList();
COMMON.closeLoading();
}; };
/** /**
...@@ -87,16 +91,21 @@ ...@@ -87,16 +91,21 @@
/** /**
* load main title callcack * load main title callcack
*/ */
RL.loadMainTitleCallback = function () { RL.loadMainTitleCallback = function () {
//add dashboard setting item //add dashboard setting item
if (RL.isQuickReport) { if (RL.isQuickReport) {
var elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'); var elmA;
let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">'); if (RL.isQRTableInspect) {
elmImg.attr('title', I18N.i18nText('reportList')); elmA = $("<div id=\"btnPdfPrint\" onclick=\"COMMON.showAlert('onlyPrintCms');\">");
elmA.append(elmImg); } else {
$('#mainTitleHeader').after(elmA); elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">');
} }
}; let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">');
elmImg.attr('title', I18N.i18nText('reportList'));
elmA.append(elmImg);
$('#mainTitleHeader').after(elmA);
}
};
/** /**
* go pdf print * go pdf print
......
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