Skip to content

C
check
Commit 11089b39 by Takumi Imai
Options

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

Feature/1.0 check web dev kdh 2

See merge request !34
parents 234a1a65 bd21bbd9
Showing with 22 additions and 26 deletions
abweb/common/js/common.js
......@@ -292,7 +292,7 @@
COMMON.checkAuth = function (async = true) {
let params = {};
params.sid = COMMON.getSid;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.AUTH_SESSION;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.AUTH_SESSION;
COMMON.cmsAjax(url, params, async, null, function () {
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
});
......
abweb/html/reportList.html
......@@ -24,7 +24,9 @@
<script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript">
</script>
</head>
<body onload="RL.init();">
......@@ -45,7 +47,7 @@
<!-- title -->
<div class="d-flex align-items-center">
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto">報告一覧</h1>
<a href="pdf.html">
<a href="pdf.html" id="btnPdfPrint">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">
</a>
</div>
......
abweb/js/dashboard/dashboard.js
......@@ -27,7 +27,7 @@ DASHBOARD.defaultDashboard = {
pushMesage: 0,
};
DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), urlPath) + CONSTANT.URL.CMS.API.DASHBOARD;
DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.DASHBOARD;
/**
* Call api get data
......
abweb/js/dashboardSetting/dashboard-setting.js
......@@ -17,7 +17,7 @@ DashboardSetting.elementItems = {
dashboardHome: { id: 'settingDashboardHome', name: 'chk-home', enabled: false },
};
DashboardSetting.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.DASHBOARD_SETTING;
DashboardSetting.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.DASHBOARD_SETTING;
/**
* default setting
......@@ -122,7 +122,7 @@ DashboardSetting.saveSetting = function () {
const element = DashboardSetting.elementItems[key];
param[key] = element.enabled ? 1 : 0;
}
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.SAVE_DASHBOARD_SETTING;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.SAVE_DASHBOARD_SETTING;
COMMON.cmsAjax(url, param, false, function (json) {
DashboardSetting.closeModal();
if (DashboardSetting.changeSettingCallback && typeof DashboardSetting.changeSettingCallback === 'function') {
......
abweb/js/header/header.js
......@@ -20,7 +20,7 @@ HEADER.processLogout = function() {
var params = {
sid: ClientData.userInfo_sid()
};
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.LOGOUT;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.LOGOUT;
COMMON.cmsAjax(url, params, false,
function (data) {
if (data.httpStatus == CONSTANT.HTTP_STATUS.OK) {
......
abweb/js/login/login.js
......@@ -334,7 +334,7 @@ LOGIN.changePasswordProcess = function() {
params.language = I18N.getCurrentLanguage();
}
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
COMMON.cmsAjax(url, params, false, function(result) {
if (result.httpStatus == '200') {
......
abweb/js/notification-content/notification-content.js
......@@ -20,7 +20,7 @@ NotificationSelect.getNotificationSelectData = function (callback) {
let param = {
sid: COMMON.getSid(),
};
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_TEMPLATE;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_TEMPLATE;
COMMON.cmsAjax(url, param, false, function (json) {
if (callback) {
callback(json);
......
abweb/js/operationList/operationList.js
......@@ -64,7 +64,7 @@ OL.getAllDataWeb = function (searchKeyWord, sortIndex, searchStartDate, searchEn
param.operationGroupMasterId = operationGroupMasterId;
}
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.ALL_OPERATION_LIST;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.ALL_OPERATION_LIST;
COMMON.cmsAjax(url, param, false, function (json) {
OL.saveSearchKeyWord(searchKeyWord, sortIndex, searchStartDate, searchEndDate, operationGroupMasterId);
......@@ -527,7 +527,7 @@ OL.saveOperationReadingLog = function (operationId, operationType, reportType) {
params.operationType = operationType;
params.reportType = reportType;
params.viewingStartDate = COMMON.currentTime();
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.OPERATION_VIEW_LOG;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.OPERATION_VIEW_LOG;
COMMON.cmsAjax(url, params, false);
};
......@@ -539,7 +539,7 @@ OL.saveOperationReadingLog = function (operationId, operationType, reportType) {
* @returns url
*/
OL.createUrlOfOperation = function (enableAddReport, reportType) {
let baseUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.HTML.BASE;
let baseUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE;
if (reportType == CONSTANT.REPORT_TYPE.ROUTINE || enableAddReport == '1') {
return baseUrl + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
} else {
......
abweb/js/operationSelect/operation-select.js
......@@ -22,7 +22,7 @@ OperationSelect.getOperationSelectData = function (callback) {
let param = {
sid: COMMON.getSid(),
};
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.OPERATION_SELECT;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.OPERATION_SELECT;
COMMON.cmsAjax(url, param, false, function (json) {
if (callback) {
callback(json);
......
abweb/js/pickup/pickup.js
......@@ -47,7 +47,7 @@ PICKUP.defaultPickupList = {
operationList:[]
}
PICKUP.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath);
PICKUP.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath());
PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.NEW_REPORT;
PICKUP.getContinuousWorkListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.WORKING_FLOW;
PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.WARNING_WITH_REPORT;
......
abweb/js/pushMessageDetail/push-message-detail.js
var PushMessageDetail = {};
PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_DETAIL;
PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_DETAIL;
/**
* dummy json for test
......
abweb/js/pushMessageList/push-message-list.js
......@@ -3,7 +3,7 @@
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
var PushMessageList = {};
PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + '';
PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_LIST;
/**
* Init when html onload
......
abweb/js/reportList/reportList.js
......@@ -26,17 +26,11 @@ RL.initTaskReportList = function() {
params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
// COMMON.postCommunication(url, params);
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
$("#task-list").load(url, params);
// COMMON.cmsAjax(url, params, false, function(result) {
// $("#task-list").html(result);
// // $("#task-list").load(result);
// }, function(XMLHttpRequest, textStatus, errorThrown) {
// }, "text");
} else {
COMMON.displayAlert("error");
COMMON.avwScreenMove("taskList.html");
}
}
abweb/js/sendMessage/send-message.js
......@@ -5,7 +5,7 @@
*/
var SendMessage = {};
SendMessage.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.SEND_PUSH_MESSAGE;
SendMessage.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.SEND_PUSH_MESSAGE;
/**
* Get input content
......
abweb/js/setting/settings.js
......@@ -77,7 +77,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
language: I18N.getCurrentLanguage(),
appId: 4
};
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
COMMON.cmsAjax(url, params, false,
SETTINGS.avwCmsApi_passwordChange_success,
SETTINGS.avwCmsApi_passwordChange_fail);
......
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