Skip to content

C
check
Commit f77d8b43 by Takumi Imai
Options

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

Reverting the function to display the pdfprint button

See merge request !73
parents 88802b88 4771234a
Showing with 133 additions and 149 deletions
abweb/common/js/common.js
...@@ -1118,33 +1118,6 @@ COMMON.checkLogin = function (option) { ...@@ -1118,33 +1118,6 @@ COMMON.checkLogin = function (option) {
return true; return true;
} }
/**
* check quick report
*/
COMMON.checkQuickReport = function (operationId, callback) {
if (operationId) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = operationId;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
COMMON.cmsAjax(
url,
params,
false,
function (result) {
if (callback) callback(result);
},
function () {
COMMON.showAlert('msgOperationEmpty');
COMMON.avwScreenMove('index.html');
},
);
} else {
COMMON.showAlert('error');
COMMON.avwScreenMove('index.html');
}
};
/* /*
* Operations for session storage [ end ] * Operations for session storage [ end ]
*/ */
......
abweb/html/reportForm.html
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom"
title="pdfPrint">
</div>
<!-- report list --> <!-- report list -->
<div class="mb-5" id="report-form"></div> <div class="mb-5" id="report-form"></div>
......
abweb/js/reportForm/reportForm.js
...@@ -5,18 +5,13 @@ ...@@ -5,18 +5,13 @@
var RF = {}; var RF = {};
RF.isQuickReport;
/** /**
* init * init
*/ */
RF.init = function () { RF.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
const operationId = sessionStorage.getItem("operationId");
COMMON.checkQuickReport(operationId, function (result) {
RF.isQuickReport = result.isQuickReport;
})
RF.loadCommon(); RF.loadCommon();
RF.initFormView(); RF.initFormView();
}; };
...@@ -111,24 +106,10 @@ RF.initBreadcrumb = function () { ...@@ -111,24 +106,10 @@ RF.initBreadcrumb = function () {
] ]
} }
} }
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, RF.loadMainTitleCallback); TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, null);
} }
/** /**
* load main title callcack
*/
RF.loadMainTitleCallback = function () {
//add dashboard setting item
if (RF.isQuickReport) {
var elmA = $('<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">');
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('reportForm'));
elmA.append(elmImg);
$('#mainTitleHeader').after(elmA);
}
};
/**
* iinit form view * iinit form view
*/ */
RF.initFormView = function () { RF.initFormView = function () {
......
abweb/js/reportList/reportList.js
...@@ -4,105 +4,130 @@ ...@@ -4,105 +4,130 @@
* @since cms:1.4.3.2&1.4.3.3 web:1.0 * @since cms:1.4.3.2&1.4.3.3 web:1.0
**/ **/
var RL = {}; var RL = {};
RL.isQuickReport; /**
* init
/** */
* init RL.init = function () {
*/ //Check if user is logged in
RL.init = function () { COMMON.showLoading();
//Check if user is logged in COMMON.checkAuth(false);
COMMON.showLoading(); console.log('ReportList init start');
COMMON.checkAuth(false); RL.checkQuickReport();
console.log('ReportList init start'); RL.loadCommon();
const operationId = sessionStorage.getItem("operationId"); RL.initTaskReportList();
COMMON.checkQuickReport(operationId, function (result) { COMMON.closeLoading();
RL.isQuickReport = result.isQuickReport; };
})
RL.loadCommon(); /**
RL.initTaskReportList(); * load common
COMMON.closeLoading(); */
}; RL.loadCommon = function () {
TEMPLATE.loadHeader('#includedHeader');
/** TEMPLATE.loadConfirmModal('#includedConfirmModal');
* load common RL.initBreadcrumb();
*/
RL.loadCommon = function () { };
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal'); /**
RL.initBreadcrumb(); * create breadcrumb menu on ReportList
*/
}; RL.initBreadcrumb = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
/** navs = [
* create breadcrumb menu on ReportList {
*/ titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
RL.initBreadcrumb = function () { href: CONSTANT.URL_TREE_NAME.DASHBOARD,
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) { },
navs = [ {
{ titleLang: CONSTANT.PAGE_NAME.PICKUP,
titleLang: CONSTANT.PAGE_NAME.DASHBOARD, href: CONSTANT.URL_TREE_NAME.PICKUP_NEW,
href: CONSTANT.URL_TREE_NAME.DASHBOARD, },
}, {
{ titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
titleLang: CONSTANT.PAGE_NAME.PICKUP, },
href: CONSTANT.URL_TREE_NAME.PICKUP_NEW, ]
}, } else {
{ if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST, navs = [
}, {
] titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
} else { href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType"); },
navs = [ {
{ titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST, },
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST, ]
}, }
{ TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_LIST, navs, RL.loadMainTitleCallback);
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST, }
},
] RL.isQuickReport;
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_LIST, navs, RL.loadMainTitleCallback); /**
} * check quick report
*/
/** RL.checkQuickReport = function () {
* init task report list if (sessionStorage.getItem("operationId")) {
*/ let params = {};
RL.initTaskReportList = function () { params.sid = COMMON.getSid();
if (sessionStorage.getItem("operationId")) { params.operationId = sessionStorage.getItem("operationId");
let params = {}; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
params.sid = COMMON.getSid(); COMMON.cmsAjax(
params.operationId = sessionStorage.getItem("operationId"); url,
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST; params,
$('#reportList').load(url, params, function () { false,
COMMON.closeLoading(); function (result) {
}); RL.isQuickReport = result.isQuickReport;
} else { },
COMMON.showAlert('error'); function () {
COMMON.avwScreenMove('index.html'); COMMON.showAlert('msgOperationEmpty');
} COMMON.avwScreenMove('index.html');
}; },
);
/** } else {
* load main title callcack COMMON.showAlert('error');
*/ COMMON.avwScreenMove('index.html');
RL.loadMainTitleCallback = function () { }
//add dashboard setting item };
if (RL.isQuickReport) {
var 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">'); * init task report list
elmImg.attr('title', I18N.i18nText('reportList')); */
elmA.append(elmImg); RL.initTaskReportList = function () {
$('#mainTitleHeader').after(elmA); if (sessionStorage.getItem("operationId")) {
} let params = {};
}; params.sid = COMMON.getSid();
params.operationId = sessionStorage.getItem("operationId");
/** let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
* go pdf print $('#reportList').load(url, params, function () {
*/ COMMON.closeLoading();
RL.goPdfPrint = function () { });
COMMON.avwScreenMove('pdfPrint.html'); } else {
}; COMMON.showAlert('error');
COMMON.avwScreenMove('index.html');
}
};
/**
* load main title callcack
*/
RL.loadMainTitleCallback = function () {
//add dashboard setting item
if (RL.isQuickReport) {
var 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="pdf出力">');
elmImg.attr('title', I18N.i18nText('reportList'));
elmA.append(elmImg);
$('#mainTitleHeader').after(elmA);
}
};
/**
* go pdf print
*/
RL.goPdfPrint = function () {
COMMON.avwScreenMove('pdfPrint.html');
};
\ No newline at end of file
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