Commit f4b02a86 by Takumi Imai

#49772 ログインチェック追加

parent e3409ed3
......@@ -121,6 +121,9 @@ DASHBOARD.initHtmlItem = function (item) {
/** Initialization dashboard screen */
DASHBOARD.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) {
......
......@@ -2,33 +2,36 @@
var PP = {};
PP.init = function() {
console.log("PP.init");
PP.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
console.log('PP.init');
PP.loadCommon();
PP.initPdfList();
};
PP.loadCommon = function() {
$("#includedHeader").load("../html/common/header.html" , function() {
PP.loadCommon = function () {
$('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
$('#includedConfirmModal').load('../html/common/confirmModal.html', function () {
I18N.initi18n();
});
}
};
PP.initPdfList = function() {
PP.initPdfList = function () {
if (sessionStorage.OL_operationId) {
let params = {};
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.QUICK_REPORT_PRINT;
$("#pdfPrint").load(url, params);
$('#pdfPrint').load(url, params);
} else {
COMMON.displayAlert("error");
COMMON.avwScreenMove("reportList.html");
COMMON.displayAlert('error');
COMMON.avwScreenMove('reportList.html');
}
}
\ No newline at end of file
};
......@@ -7,18 +7,20 @@ PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Clie
*/
PushMessageDetail.dummyMessageDetailJson = {
pushMessageId: 1,
pushMessage: "内容が入ります。内容が入ります。内容が入ります。内容が入ります。",
pushSendDate: "2022/07/06 14:14",
operationName: "絞り検索",
pushSendLoginId: "agentec"
}
pushMessage: '内容が入ります。内容が入ります。内容が入ります。内容が入ります。',
pushSendDate: '2022/07/06 14:14',
operationName: '絞り検索',
pushSendLoginId: 'agentec',
};
/**
* init when html loaded
*/
PushMessageDetail.init = function() {
PushMessageDetail.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
//load common html
TEMPLATE.loadHearder("#includedHeader");
TEMPLATE.loadHearder('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......@@ -32,44 +34,50 @@ PushMessageDetail.init = function() {
titleLang: 'messageDetail',
},
];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "messageDetail", navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageDetail', navs, null);
//request message detail data
let urlParam = COMMON.getUrlParameter();
if (typeof urlParam !== 'object' || typeof urlParam.pushMessageId === 'undefined') {
return;
}
PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function(message) {
PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function (message) {
PushMessageDetail.showMessage(message);
});
}
};
/**
* request message data
* @param {string} pushMessageId
* @param {object} callback
*/
PushMessageDetail.getMessageDetail = function(pushMessageId, callback) {
PushMessageDetail.getMessageDetail = function (pushMessageId, callback) {
let param = {
sid: COMMON.getSid(),
pushMessageId: pushMessageId
pushMessageId: pushMessageId,
};
const url = PushMessageDetail.baseApiUrl;
COMMON.cmsAjax(url, param, true, function (json) {
COMMON.cmsAjax(
url,
param,
true,
function (json) {
if (callback && json && json.pushMessage) {
callback(json.pushMessage);
}
}, function() {
},
function () {
console.log('PushMessageDetail.getMessageDetail error');
});
}
},
);
};
/**
* Show message data
* @param {object} message
*/
PushMessageDetail.showMessage = function(message) {
PushMessageDetail.showMessage = function (message) {
$('#content').text(message.pushMessage);
$('#sendDate').text(message.pushSendDate);
$('#operationName').text(message.operationName);
$('#sender').text(message.pushSendLoginId);
}
};
......@@ -8,8 +8,10 @@ PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Client
/**
* Init when html onload
*/
PushMessageList.init = function() {
TEMPLATE.loadHearder("#includedHeader");
PushMessageList.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......@@ -19,11 +21,11 @@ PushMessageList.init = function() {
titleLang: 'messageListTitle',
},
];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "messageListTitle", navs, null);
PushMessageList.getMessageList(function(messageList) {
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageListTitle', navs, null);
PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList);
});
}
};
/**
* get Message List from CMS
......@@ -34,29 +36,35 @@ PushMessageList.getMessageList = function (callback) {
sid: COMMON.getSid(),
};
const url = PushMessageList.baseApiUrl;
COMMON.cmsAjax(url, param, true, function (json) {
COMMON.cmsAjax(
url,
param,
true,
function (json) {
if (callback) {
callback(json);
}
}, function() {
},
function () {
console.log('PushMessageList.getMessageList error');
});
},
);
};
/**
* handle click message event
* @param {string} pushMessageId
*/
PushMessageList.clickMessage = function(pushMessageId) {
COMMON.goUrlWithCurrentParams('pushMessageDetail.html', {pushMessageId: pushMessageId});
}
PushMessageList.clickMessage = function (pushMessageId) {
COMMON.goUrlWithCurrentParams('pushMessageDetail.html', { pushMessageId: pushMessageId });
};
/**
* generate message list html
* @param {array} messageList
* @returns
*/
PushMessageList.generateMessageListHtml = function(messageList) {
PushMessageList.generateMessageListHtml = function (messageList) {
if (typeof messageList === 'undefined' || messageList.length < 1) {
//show not found
$('#messageList .not-found').removeClass('d-none');
......@@ -76,7 +84,7 @@ PushMessageList.generateMessageListHtml = function(messageList) {
messageLi.addClass('unread');
}
var messageA = $('<a class="d-block px-3 py-2 text-decoration-none text-dark"/>');
messageA.attr('href', "javascript:PushMessageList.clickMessage('" + messageId +"');");
messageA.attr('href', "javascript:PushMessageList.clickMessage('" + messageId + "');");
var titleDiv = $('<div class="fs-12 text-truncate">' + mTitle + '</div>');
var subTitleMainDiv = $('<div class="d-flex justify-content-between align-items-center"></div>');
var subTitleDiv = $('<div class="fs-10 text-truncate">' + mSubtitle + '</div>');
......@@ -94,17 +102,20 @@ PushMessageList.generateMessageListHtml = function(messageList) {
* dummy message list JSON for test
*/
PushMessageList.dummyMessageListJson = {
pushMessageList: [{
pushMessageList: [
{
pushMessageId: 1,
pushMessage: 'メッセージ内容が入ります。',
pushSendDate: '2022/07/06 14:14',
operationName: '作業名が入ります。',
readingFlg: 0,
}, {
},
{
pushMessageId: 2,
pushMessage: 'メッセージ内容が入ります。メッセージ内容が入ります。メッセージ内容が入ります。メッセージ内容が入ります。',
pushSendDate: 'xxxxxxxxxxxxxxxxxxxxxxxxxx',
operationName: '作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。',
readingFlg: 1,
}]
},
],
};
......@@ -3,6 +3,9 @@
var RF = {};
RF.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
RF.loadCommon();
RF.initFormView();
......
......@@ -2,39 +2,39 @@
var RL = {};
RL.init = function() {
console.log("ReportList init start");
// COMMON.checkAuth(true);
RL.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
console.log('ReportList init start');
RL.loadCommon();
RL.initTaskReportList();
};
RL.loadCommon = function() {
$("#includedHeader").load("../html/common/header.html" , function() {
RL.loadCommon = function () {
$('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
$('#includedConfirmModal').load('../html/common/confirmModal.html', function () {
I18N.initi18n();
});
}
};
RL.initTaskReportList = function() {
RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) {
let params = {};
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;
$("#reportList").load(url, params);
$('#reportList').load(url, params);
} else {
COMMON.displayAlert("error");
COMMON.avwScreenMove("index.html");
COMMON.displayAlert('error');
COMMON.avwScreenMove('index.html');
}
}
RL.goPdfPrint = function() {
COMMON.avwScreenMove("pdfPrint.html");
}
};
RL.goPdfPrint = function () {
COMMON.avwScreenMove('pdfPrint.html');
};
......@@ -12,31 +12,31 @@ SendMessage.contentMaxLength = 207;
* Get input content
* @returns string
*/
SendMessage.getCurrentMessageContent = function() {
SendMessage.getCurrentMessageContent = function () {
return $('#messageContent').val();
}
};
/**
* Get operation id selected
* @returns string
*/
SendMessage.getCurrentOperationId = function() {
SendMessage.getCurrentOperationId = function () {
return $('#operationSelected').attr('data-operation-id');
}
};
/**
* Get send type selected
* @returns string
*/
SendMessage.getCurrentSendType = function() {
SendMessage.getCurrentSendType = function () {
return $('input[name="sendType"]:checked').val();
}
};
/**
* Check data required when send message request to cms
* @returns boolean
*/
SendMessage.checkValidation = function() {
SendMessage.checkValidation = function () {
const message = SendMessage.getCurrentMessageContent();
if (!ValidationUtil.CheckRequiredForText(message)) {
alert(I18N.i18nText('msgContentRequired'));
......@@ -62,7 +62,7 @@ SendMessage.checkValidation = function() {
/**
* handle click event of send button
*/
SendMessage.onClickSend = function() {
SendMessage.onClickSend = function () {
if (!SendMessage.checkValidation()) {
return;
}
......@@ -78,35 +78,40 @@ SendMessage.onClickSend = function() {
* @param {long} operationId
* @param {int} sendType - 0: Group, 1: All
*/
SendMessage.postMessage = function(message, operationId, sendType) {
SendMessage.postMessage = function (message, operationId, sendType) {
let param = {
sid: COMMON.getSid(),
message: message,
operationId: operationId,
sendType: sendType
sendType: sendType,
};
COMMON.cmsAjax(SendMessage.baseApiUrl, param, false, function (json) {
}, function() {
COMMON.cmsAjax(
SendMessage.baseApiUrl,
param,
false,
function (json) {},
function () {
console.log('SendMessage.postMessage error');
});
},
);
};
SendMessage.operationSelectedCallback = function(operationId, operationName) {
SendMessage.operationSelectedCallback = function (operationId, operationName) {
$('#operationSelected').attr('data-operation-id', operationId);
$('#operationSelected').text(operationName);
}
};
SendMessage.templateSelectedCallback = function(template) {
SendMessage.templateSelectedCallback = function (template) {
$('#messageContent').val(template);
}
};
/**
* init data, action when screen onload
*/
SendMessage.init = function () {
TEMPLATE.loadHearder("#includedHeader");
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......@@ -116,7 +121,7 @@ SendMessage.init = function () {
titleLang: 'sendMessageTitle',
},
];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "sendMessageTitle", navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessageTitle', navs, null);
TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback);
TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback);
$('#messageContent').attr('maxlength', SendMessage.contentMaxLength);
......
......@@ -4,13 +4,14 @@ var SETTINGS = {};
// Init function of page
$(document).ready(function () {
//Check if user is logged in
COMMON.checkAuth(false);
SETTINGS.initScreen();
$("#dspPwdUpd1").click(SETTINGS.dspPwdUpd1_Click);
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
});
// Process changing password
SETTINGS.dspPwdUpd1_Click = function(e) {
SETTINGS.dspPwdUpd1_Click = function (e) {
e.preventDefault();
var isOK = true;
var msgError = $('#main-error-message');
......@@ -19,8 +20,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
isOK = false;
msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdCurr')).toString());
msgError.show();
}
else {
} else {
if (!ValidationUtil.CheckRequiredForText(SETTINGS.getNewPassword())) {
isOK = false;
msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdNew')).toString());
......@@ -38,7 +38,6 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
}
}
if (isOK) {
// Check min length
if (!ValidationUtil.CheckMinLengthForByte(SETTINGS.getNewPassword(), 6)) {
isOK = false;
......@@ -68,43 +67,38 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
// Do changing password
if (isOK) {
var params = {
sid: ClientData.userInfo_sid(),
loginId: ClientData.userInfo_loginId_session(),
password: SETTINGS.getCurrentPassword(),
newPassword: SETTINGS.getNewPassword(),
language: I18N.getCurrentLanguage(),
appId: 4
appId: 4,
};
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);
}
else {
COMMON.cmsAjax(url, params, false, SETTINGS.avwCmsApi_passwordChange_success, SETTINGS.avwCmsApi_passwordChange_fail);
} else {
//alert('error');
}
};
SETTINGS.avwCmsApi_passwordChange_success = function(data) {
SETTINGS.avwCmsApi_passwordChange_success = function (data) {
// OK
var msgError = $('#main-error-message');
if (data.httpStatus != CONSTANT.HTTP_STATUS.OK) {
msgError.html(I18N.i18nText('msgPwdChangeNG'));
msgError.show();
}
else {
} else {
msgError.html('');
$("#txtPwdCur").val("");
$("#txtPwdNew").val("");
$("#txtPwdNewRe").val("");
$('#txtPwdCur').val('');
$('#txtPwdNew').val('');
$('#txtPwdNewRe').val('');
/* show messages */
COMMON.displayAlert('msgPwdChangeOK');
}
};
SETTINGS.avwCmsApi_passwordChange_fail = function(xhr, b, c) {
SETTINGS.avwCmsApi_passwordChange_fail = function (xhr, b, c) {
/* show error messages */
var msgError = $('#main-error-message');
if (xhr.errorMessage && xhr.httpStatus != 0) {
......@@ -115,7 +109,6 @@ SETTINGS.avwCmsApi_passwordChange_fail = function(xhr, b, c) {
msgError.show();
};
/*
----------------------------------------------------------------------------
Event groups [ end ]
......@@ -123,33 +116,32 @@ Event groups [ end ]
*/
// Get input current password
SETTINGS.getCurrentPassword = function() {
return $("#txtPwdCur").val();
SETTINGS.getCurrentPassword = function () {
return $('#txtPwdCur').val();
};
// Get input new password
SETTINGS.getNewPassword = function() {
return $("#txtPwdNew").val();
SETTINGS.getNewPassword = function () {
return $('#txtPwdNew').val();
};
// Get input new password
SETTINGS.getNewPasswordRe = function() {
return $("#txtPwdNewRe").val();
SETTINGS.getNewPasswordRe = function () {
return $('#txtPwdNewRe').val();
};
// Initalize screen
SETTINGS.initScreen = function() {
$("#includedHeader").load("../html/common/header.html" , function() {
SETTINGS.initScreen = function () {
$('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
$('#includedConfirmModal').load('../html/common/confirmModal.html', function () {
I18N.initi18n();
});
// Login ID
$("#txtLoginId").text(ClientData.userInfo_loginId_session());
$('#txtLoginId').text(ClientData.userInfo_loginId_session());
// Account Path
$("#txtLoginAccPath").text(ClientData.userInfo_accountPath_session());
$('#txtLoginAccPath').text(ClientData.userInfo_accountPath_session());
// Recent login date
$("#txtLastLoginTime").text(ClientData.userInfo_lastLoginTime());
$('#txtLastLoginTime').text(ClientData.userInfo_lastLoginTime());
};
......@@ -5,65 +5,62 @@
var TEMPLATE = {};
/** template load header */
TEMPLATE.loadHearder = function(elmentId) {
$(elmentId).load("../html/common/header.html" , function() {
$("#iconHomeDashboard").removeClass('active');
$("#iconHomeWorkList").removeClass('active');
if(sessionStorage.activeHomePage == CONSTANT.PAGE_NAME.OPERATION_LIST)
{
$("#iconHomeWorkList").addClass('active');
}
else
{
$("#iconHomeDashboard").addClass('active');
TEMPLATE.loadHearder = function (elmentId) {
$(elmentId).load('../html/common/header.html', function () {
$('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active');
if (sessionStorage.activeHomePage == CONSTANT.PAGE_NAME.OPERATION_LIST) {
$('#iconHomeWorkList').addClass('active');
} else {
$('#iconHomeDashboard').addClass('active');
}
I18N.initi18n();
});
}
};
/**
* template load dashboard setting
* @param {string} elmentId - element to load setting html
* @param {*} changeCallback - callback when setting changed
*/
TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) {
$(elmentId).load("dashboardSetting.html", function() {
TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) {
$(elmentId).load('dashboardSetting.html', function () {
DashboardSetting.init(changeCallback);
I18N.initi18n();
});
}
};
/** Template load confirm model */
TEMPLATE.loadConfirmModal = function(elmentId) {
$(elmentId).load("../html/common/confirmModal.html", function() {
TEMPLATE.loadConfirmModal = function (elmentId) {
$(elmentId).load('../html/common/confirmModal.html', function () {
I18N.initi18n();
});
}
};
/** Template load operation select */
TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) {
$(elmentId).load("operationSelect.html", function() {
TEMPLATE.loadOperationSelect = function (elmentId, selectCallback) {
$(elmentId).load('operationSelect.html', function () {
OperationSelect.init(selectCallback);
I18N.initi18n();
});
}
};
/**
* show confirm model
*/
TEMPLATE.showModalConfirm = function () {
$("#showConfirm").click(function(){
$("#confirm-modal").modal();
TEMPLATE.showModalConfirm = function () {
$('#showConfirm').click(function () {
$('#confirm-modal').modal();
});
};
/** Template load notification content*/
TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
$(elmentId).load("notificationContent.html", function() {
TEMPLATE.loadNotificationSelect = function (elmentId, selectCallback) {
$(elmentId).load('notificationContent.html', function () {
NotificationSelect.init(selectCallback);
I18N.initi18n();
});
}
};
/**
* load main navs title html to a element by id
......@@ -71,15 +68,15 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
* @param {string} titleLang - lang of title
* @param {Array} navs - array nav items (titleLang, href)
*/
TEMPLATE.loadMainNavsTitle = function(elmentId, titleLang, navs, completeCallback) {
var titleHtmlPath = '../common/mainTitle.html';
TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, navs, completeCallback) {
var titleHtmlPath = '../common/html/mainTitle.html';
if (navs) {
titleHtmlPath = '../common/mainNavTitle.html';
titleHtmlPath = '../common/html/mainNavTitle.html';
}
$(elmentId).load(titleHtmlPath , function(data) {
$(elmentId).load(titleHtmlPath, function (data) {
$(elmentId).replaceWith(data);
if (titleLang) {
$('#mainTitleHeader').attr("lang", titleLang);
$('#mainTitleHeader').attr('lang', titleLang);
}
if (navs) {
var olElm = $('#mainTitleNavs ol');
......@@ -109,4 +106,4 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
completeCallback();
}
});
}
};
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