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) {
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 ]
*/
......
abweb/html/reportForm.html
......@@ -35,6 +35,10 @@
<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 -->
<div class="mb-5" id="report-form"></div>
......
abweb/js/reportForm/reportForm.js
......@@ -5,18 +5,13 @@
var RF = {};
RF.isQuickReport;
/**
* init
*/
RF.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
const operationId = sessionStorage.getItem("operationId");
COMMON.checkQuickReport(operationId, function (result) {
RF.isQuickReport = result.isQuickReport;
})
RF.loadCommon();
RF.initFormView();
};
......@@ -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
*/
RF.initFormView = function () {
......
abweb/js/reportList/reportList.js
......@@ -4,105 +4,130 @@
* @since cms:1.4.3.2&1.4.3.3 web:1.0
**/
var RL = {};
var RL = {};
RL.isQuickReport;
/**
* init
*/
RL.init = function () {
//Check if user is logged in
COMMON.showLoading();
COMMON.checkAuth(false);
console.log('ReportList init start');
const operationId = sessionStorage.getItem("operationId");
COMMON.checkQuickReport(operationId, function (result) {
RL.isQuickReport = result.isQuickReport;
})
RL.loadCommon();
RL.initTaskReportList();
COMMON.closeLoading();
};
/**
* load common
*/
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 = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_NEW,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
},
]
} else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
},
]
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_LIST, navs, RL.loadMainTitleCallback);
}
/**
* init task report list
*/
RL.initTaskReportList = function () {
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;
$('#reportList').load(url, params, function () {
COMMON.closeLoading();
});
} 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="pdfPrint">');
elmImg.attr('title', I18N.i18nText('reportList'));
elmA.append(elmImg);
$('#mainTitleHeader').after(elmA);
}
};
/**
* go pdf print
*/
RL.goPdfPrint = function () {
COMMON.avwScreenMove('pdfPrint.html');
};
/**
* init
*/
RL.init = function () {
//Check if user is logged in
COMMON.showLoading();
COMMON.checkAuth(false);
console.log('ReportList init start');
RL.checkQuickReport();
RL.loadCommon();
RL.initTaskReportList();
COMMON.closeLoading();
};
/**
* load common
*/
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 = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_NEW,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
},
]
} else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
},
]
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_LIST, navs, RL.loadMainTitleCallback);
}
RL.isQuickReport;
/**
* check quick report
*/
RL.checkQuickReport = function () {
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.API.IS_QUICK_REPORT;
COMMON.cmsAjax(
url,
params,
false,
function (result) {
RL.isQuickReport = result.isQuickReport;
},
function () {
COMMON.showAlert('msgOperationEmpty');
COMMON.avwScreenMove('index.html');
},
);
} else {
COMMON.showAlert('error');
COMMON.avwScreenMove('index.html');
}
};
/**
* init task report list
*/
RL.initTaskReportList = function () {
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;
$('#reportList').load(url, params, function () {
COMMON.closeLoading();
});
} 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