Skip to content

C
check
Commit 4c29f689 by Kang Donghun
Options

pull commit

parent 1722f5fc
Showing with 132 additions and 252 deletions
abweb/common/html/header.html
......@@ -30,7 +30,7 @@
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
<span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
</a>
<a class="dropdown-item " href="login.html" id="btnLogout">
<a class="dropdown-item " href="#" data-toggle="modal" data-target="#confirm-modal" id="btnLogout">
<img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
<span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
</a>
......
abweb/common/js/header.js
......@@ -12,9 +12,77 @@ $(function () {
HEADER.init = function() {
$("#dspLoginId").text(ClientData.userInfo_loginId());
HEADER.urlTree();
};
HEADER.initLogout = function() {
$("#btnLogout").click(HEADER.logoutFunction);
};
}
/**
* create url tree & show breadcrumbs list
*/
HEADER.urlTree = function () {
const pathName = location.pathname;
const htmlName = pathName.substring(pathName.indexOf('/') + 1);
console.log("kdh check pathName : " + pathName);
console.log("kdh check htmlName : " + htmlName);
//now url tree
let urlTree = sessionStorage.getItem('urlTree');
console.log("kdh check urlTree : " + urlTree);
// check auth
let authFlg = false;
if ((!urlTree && htmlName == CONSTANT.URL_TREE_NAME.OPERATION_LIST) || htmlName == CONSTANT.URL_TREE_NAME.DASHBOARD) {
authFlg = true;
session.removeItem('urlTree');
}
// urlList: for (const i in urlTree) {
// const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
// findUrl: for (const passList in CONSTANT.URL_TREE_PASS) {
// for (const k in passList) {
// if (urlHtmlName == passList[k]) {
// if (htmlName == passList[k]) {
// authFlg = true;
// break urlList;
// }
// break;
// } else {
// break findUrl;
// }
// }
// }
// }
// return ;
// if (authFlg) {
// session.removeItem('urlTree');
// let newUrlTree = {};
// const urlPath = htmlName + location.search;
// for (const i in urlTree) {
// const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
// if (urlHtmlName == htmlName) {
// newUrlTree.push(urlPath);
// } else {
// newUrlTree.push(urlTree[i]);
// }
// }
// session.setItem('urlTree', newUrlTree);
// //show urlTree
// if ($('.breadcrumb').length) {
// for (const i in newUrlTree) {
// const urlHtmlName = newUrlTree[i].substring(0, pathName.indexOf('?'));
// if (urlHtmlName == htmlName) {
// $('.breadcrumb').append('<li class="breadcrumb-item">作業一覧</li>');
// } else {
// $('.breadcrumb').append('<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>');
// }
// }
// }
// } else {
// COMMON.avwScreenMove('index.html');
// }
};
/** Direct home page setting */
HEADER.goToHomePage = function (pageId) {
......
abweb/html/accountSetting.html
......@@ -17,11 +17,12 @@
<script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.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" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/validation.js"></script>
<script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script>
</head>
......@@ -30,18 +31,18 @@
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<!-- account setting -->
<main id="main">
<div class="container-wrap">
<!-- title -->
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="account_setting">アカウント設定</h1>
<div id="includedMainTitle"></div>
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="account_setting"></h1>
<!-- content -->
<div class="row">
<div class="col-md-6 col-12 mb-4">
<div class="card p-4">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="accountInformation">アカウント情報</h2>
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="account_setting"></h2>
<table>
<colgroup>
<col span="1" class="w-120px">
......
abweb/html/index.html
......@@ -24,10 +24,10 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../js/template/template.js?__UPDATEID__"></script>
<script src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script src="../js/dashboardSetting/dashboardSetting.js?__UPDATEID__"></script>
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="../js/template/template.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head>
......
abweb/html/pdfPrint.html
......@@ -24,11 +24,11 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/template/template.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/pdfPrint/pdfPrint.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">
$(document).ready(function() {
PP.init();
......
abweb/html/reportList.html
......@@ -17,12 +17,10 @@
<script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.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" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
......
abweb/js/dashboard/dashboard.js
......@@ -141,7 +141,7 @@ DASHBOARD.init = function () {
};
/** load common data */
DASHBOARD.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadDashboardSetting('#includedDashboardSetting', DASHBOARD.changeSettingCallback);
TEMPLATE.loadConfirmModal('#includedConfirmModal');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'dashboard', null, DASHBOARD.loadMainTitleCallback);
......
abweb/js/header/header.js deleted 100644 → 0
/**
* header js for index.
* ※Code is written mainly for dashboard and operationList.
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
var HEADER = {};
/**
* init
*/
HEADER.init = function () {
$('#dspLoginId').text(ClientData.userInfo_loginId());
$('#btnLogout').click(HEADER.logoutFunction);
};
/**
* create url tree & show breadcrumbs list
*/
HEADER.urlTree = function () {
const pathName = location.pathname;
const htmlName = pathName.substring(pathName.indexOf('/') + 1);
//now url tree
let urlTree = session.getItem('urlTree');
// check auth
let authFlg = false;
if ((!urlTree && htmlName == CONSTANT.URL_TREE_NAME.OPERATION_LIST) || htmlName == CONSTANT.URL_TREE_NAME.DASHBOARD) {
authFlg = true;
session.removeItem('urlTree');
}
urlList: for (const i in urlTree) {
const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
findUrl: for (const passList in CONSTANT.URL_TREE_PASS) {
for (const k in passList) {
if (urlHtmlName == passList[k]) {
if (htmlName == passList[k]) {
authFlg = true;
break urlList;
}
break;
} else {
break findUrl;
}
}
}
}
if (authFlg) {
session.removeItem('urlTree');
let newUrlTree = {};
const urlPath = htmlName + location.search;
for (const i in urlTree) {
const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
if (urlHtmlName == htmlName) {
newUrlTree.push(urlPath);
} else {
newUrlTree.push(urlTree[i]);
}
}
session.setItem('urlTree', newUrlTree);
//show urlTree
if ($('.breadcrumb').length) {
for (const i in newUrlTree) {
const urlHtmlName = newUrlTree[i].substring(0, pathName.indexOf('?'));
if (urlHtmlName == htmlName) {
$('.breadcrumb').append('<li class="breadcrumb-item">作業一覧</li>');
} else {
$('.breadcrumb').append('<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>');
}
}
}
} else {
COMMON.avwScreenMove('index.html');
}
};
/**
* Direct home page setting
* @param {*} pageId
*/
HEADER.goToHomePage = function (pageId) {
DashboardSetting.getSettingData(function (settings) {
if (settings.dashboardHome == 1) {
HEADER.goDashboard();
} else {
HEADER.goOperationList();
}
});
};
/**
* logout function
*/
HEADER.logoutFunction = function () {
console.log('clicked logout');
$('#msgModel').text(I18N.i18nText('msgLogoutConfirm'));
$('#confirmYes').click(HEADER.processLogout);
};
/**
* process logout
*/
HEADER.processLogout = function () {
var params = {
sid: ClientData.userInfo_sid(),
};
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) {
SessionStorageUtils.clear();
COMMON.userSetting().remove(CONSTANT.KEYS.userInfo_sid);
COMMON.userSetting().remove(CONSTANT.KEYS.userInfo_sid_local);
// Move to login screen
//window.location = COMMON.ScreenIds.Login;
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
} else {
if (data.errorMessage) {
COMMON.displayAlert(data.errorMessage);
} else {
COMMON.displayAlert('errorOccured');
}
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
if (xmlHttpRequest.errorMessage) {
COMMON.displayAlert(xmlHttpRequest.errorMessage);
} else {
COMMON.displayAlert('errorOccured');
}
},
);
};
/**
* Go page of operationList
*/
HEADER.goOperationList = function () {
sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
OL.init();
};
/**
* Go page of dashboard
*/
HEADER.goDashboard = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
COMMON.avwScreenMove('dashboard.html');
};
/**
* Initialize with any navigation
*
* @param {String} bottomNav
*/
HEADER.activeInitBottomNav = function (bottomNav) {
HEADER.inactiveAllBottomNav();
HEADER.activeBottomNav(bottomNav);
};
/**
* change inactive all footer bottom
*/
HEADER.inactiveAllBottomNav = function () {
let navs = document.getElementsByClassName('bottom-nav');
for (i = 0; i < navs.length; i++) {
navs[i].className = navs[i].className.replace('text-primary', 'text-secondary');
let img = navs[i].querySelector('img');
if (img && img.getAttribute('data-inactive-src')) {
img.src = img.getAttribute('data-inactive-src');
}
}
};
/**
* Change specific footer bottom to active.
*
* @param {String} bottomNavId
*/
HEADER.activeBottomNav = function (bottomNavId) {
let elm = $('#' + bottomNavId);
if (typeof elm !== 'object') {
console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId);
return;
}
elm.removeClass('text-secondary');
elm.addClass('text-primary');
let img = elm.find('img')[0];
if (img && img.getAttribute('data-src')) {
img.src = img.getAttribute('data-src');
}
};
abweb/js/operationList/operationList.js
......@@ -23,7 +23,7 @@ OL.operationGroupMasterId;
OL.init = function () {
console.log('OperationList start');
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', null, null);
TEMPLATE.loadConfirmModal('#includedConfirmModal');
......@@ -503,6 +503,9 @@ OL.resetSearch = function () {
OL.sendOperation = function (operationId, operationType, reportType, enableAddReport) {
//save operation logs. needed for sorting
OL.saveOperationReadingLog(operationId, operationType, reportType);
const urlTree = { titleLang: CONSTANT.URL_TREE_NAME.OPERATION_LIST };
sessionStorage.setItem('urlTree', { titleLang: CONSTANT.URL_TREE_NAME.OPERATION_LIST });
sessionStorage.setItem('nameTree', {CONSTANT.PAGE_NAME.OPERATION_LIST});
//Transition to the report form or operation list screen
if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) {
sessionStorage.OL_operationId = operationId;
......
abweb/js/pdfPrint/pdfPrint.js
......@@ -25,13 +25,9 @@ PP.init = function () {
* load common
*/
PP.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../common/html/confirmModal.html', function () {
I18N.initi18n();
});
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pdfPrint', navs, null);
};
/**
......
abweb/js/pickup/pickup.js
......@@ -137,7 +137,7 @@ PICKUP.init = function () {
console.log('PICKUP.init');
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
......
abweb/js/pushMessageDetail/pushMessageDetail.js
......@@ -25,7 +25,7 @@ PushMessageDetail.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
//load common html
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......
abweb/js/pushMessageList/pushMessageList.js
......@@ -11,7 +11,7 @@ PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Client
PushMessageList.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......
abweb/js/reportForm/reportForm.js
......@@ -21,13 +21,8 @@ RF.init = function () {
* load common
*/
RF.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../html/common/confirm-modal.html', function () {
I18N.initi18n();
});
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
};
/**
......
abweb/js/reportList/reportList.js
......@@ -23,17 +23,31 @@ RL.init = function () {
* load common
*/
RL.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
},
{
titleLang: 'pickup',
},
];
let urlTree = sessionStorage.getItem('urlTree');
let nameTree = sessionStorage.getItem('nameTree');
console.log("kdh check urlTree : " + urlTree);
console.log("kdh check nameTree : " + nameTree);
// const navs = [
// {
// titleLang: 'dashboard',
// href: 'dashboard.html',
// },
// {
// titleLang: 'pickup',
// },
// ];
const navs = [];
if (urlTree) {
for (var i = 0; i < urlTree.length; i++) {
navs[i] = { titleLang: nameTree[i], href: urlTree[i]}
}
}
navs[navs.length - 1] = {titleLang: "reportList"};
console.log("kdh check navs : " + navs);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'reportList', navs, RL.loadMainTitleCallback);
};
......
abweb/js/sendMessage/sendMessage.js
......@@ -120,7 +120,7 @@ SendMessage.templateSelectedCallback = function (template) {
SendMessage.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......
abweb/js/setting/settings.js
......@@ -148,13 +148,18 @@ SETTINGS.getNewPasswordRe = function () {
// Initalize screen
SETTINGS.initScreen = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../common/html/confirmModal.html', function () {
I18N.initi18n();
});
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
titleLang: 'txtTooltipBack',
href: 'javascript:history.back();',
},
{
titleLang: 'account_setting',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', '', navs, null);
// Login ID
$('#txtLoginId').text(ClientData.userInfo_loginId_session());
// Account Path
......
abweb/js/template/template.js
......@@ -5,7 +5,7 @@
var TEMPLATE = {};
/** template load header */
TEMPLATE.loadHearder = function (elmentId) {
TEMPLATE.loadHeader = function (elmentId) {
$(elmentId).load('../common/html/header.html', function () {
$('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active');
......@@ -37,6 +37,7 @@ TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) {
*/
TEMPLATE.loadConfirmModal = function (elmentId) {
$(elmentId).load('../common/html/confirmModal.html', function () {
HEADER.initLogout();
I18N.initi18n();
});
};
......
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