Skip to content

C
check
Commit f0e499fd by Kang Donghun
Options

パンくずボタン実装

parent f5a95910
Showing with 67 additions and 122 deletions
abweb/common/html/header.html
......@@ -27,8 +27,8 @@
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<h6 class="dropdown-header" id="dspLoginId" ></h6>
<a class="dropdown-item " href="accountSetting.html" >
<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>
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="accountSetting">
<span class="lang" style=" color: #6c757d;" lang="accountSetting"></span>
</a>
<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">
......
abweb/common/js/constant.js
......@@ -18,7 +18,8 @@ CONSTANT.SORT_TYPE = {
CONSTANT.PAGE_NAME = {
DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList',
OPERATION_LIST: 'workList',
REPORT_LIST: 'reportList',
DEFAULT: 'index.html',
LOGIN: './login.html',
};
......@@ -33,6 +34,7 @@ CONSTANT.URL_TREE_NAME = {
SEND_MESSAGE: 'sendMessage.html',
SETTING: 'accountSetting.html',
PICKUP: 'pickup.html',
PDF_PRINT: 'pdfPrint.html',
};
CONSTANT.URL_TREE_PASS = {
......@@ -40,6 +42,8 @@ CONSTANT.URL_TREE_PASS = {
2: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_FORM],
3: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.MESSAGE_LIST, CONSTANT.URL_TREE_NAME.MESSAGE_DETAIL],
4: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.SEND_MESSAGE],
5: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
6: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.PDF_PRINT],
};
CONSTANT.PAGE_TAB = {
......
abweb/common/json/lang/lang-en.json
......@@ -55,14 +55,14 @@
"communication":"Communication",
"workList":"Work list",
"profile":"Profile",
"account_setting":"Account setting",
"accountSetting":"Account setting",
"newRegistrationTitle":"New Registration",
"continousWorkTitle":"Continous Work",
"processWorkTitle":"Process work",
"reportWarningTitle":"Report With Warnings",
"workWithWarningsTitle":"Work with warnings",
"messageListTitle":"Message List",
"sendMessageTitle":"Send Message",
"pushMessageList":"Message List",
"sendMessage":"Send Message",
"distanceSupportTitle":"Distance Support",
"chatTitle":"Chat",
"makeDashboardAsHome":"Set dashboard to home screen",
......@@ -77,7 +77,7 @@
"confirmYes":"Yes",
"confirmNo":"No",
"messageListEmpty":"No Messages",
"messageDetail":"Message Details",
"pushMessageDetail":"Message Details",
"operationName":"Operation Name",
"sendDate":"Send Date",
"sender":"Sender",
......
abweb/common/json/lang/lang-ja.json
......@@ -53,14 +53,14 @@
"communication":"コミュニケーション",
"workList":"作業一覧",
"profile":"プロフィール",
"account_setting":"アカウント設定",
"accountSetting":"アカウント設定",
"newRegistrationTitle":"新規報告",
"continousWorkTitle":"工程管理",
"processWorkTitle":"工程作業",
"reportWarningTitle":"警告を含む報告",
"workWithWarningsTitle":"警告を含む作業",
"messageListTitle":"メッセージ一覧",
"sendMessageTitle":"メッセージ送信",
"pushMessageList":"メッセージ一覧",
"sendMessage":"メッセージ送信",
"distanceSupportTitle":"遠隔支援",
"chatTitle":"チャット",
"makeDashboardAsHome":"ダッシュボードをホーム画面にする",
......@@ -75,7 +75,7 @@
"confirmYes":"はい",
"confirmNo":"いいえ",
"messageListEmpty":"メッセージがありません。",
"messageDetail":"メッセージ詳細",
"pushMessageDetail":"メッセージ詳細",
"operationName":"作業名",
"sendDate":"送信日時",
"sender":"送信者",
......
abweb/common/json/lang/lang-ko.json
......@@ -52,14 +52,14 @@
"communication":"커뮤니케이션",
"workList":"작업 일람",
"profile":"프로필",
"account_setting":"계정 설정",
"accountSetting":"계정 설정",
"newRegistrationTitle":"신규 등록",
"continousWorkTitle":"정기점검",
"processWorkTitle":"공정관리",
"reportWarningTitle":"경고를 포함한 보고",
"workWithWarningsTitle":"경고를 포함한 작업",
"messageListTitle":"메시지 일람",
"sendMessageTitle":"메시지 송신",
"pushMessageList":"메시지 일람",
"sendMessage":"메시지 송신",
"distanceSupportTitle":"원격 지원",
"chatTitle":"채팅",
"makeDashboardAsHome":"대시보드를 홈화면으로 지정",
......@@ -74,7 +74,7 @@
"confirmYes":"예",
"confirmNo":"아니오",
"messageListEmpty":"표시할 메시지가 없습니다.",
"messageDetail":"메시지 상세",
"pushMessageDetail":"메시지 상세",
"operationName":"작업명",
"sendDate":"송신일시",
"sender":"송신자",
......
abweb/html/accountSetting.html
......@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="account_setting"></title>
<title class="lang" lang="accountSetting"></title>
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
......@@ -36,13 +36,13 @@
<div class="container-wrap">
<!-- title -->
<div id="includedMainTitle"></div>
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="account_setting"></h1>
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="accountSetting"></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="account_setting"></h2>
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="accountSetting"></h2>
<table>
<colgroup>
<col span="1" class="w-120px">
......
abweb/html/pdfPrint.html
......@@ -19,7 +19,6 @@
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/i18n.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 src="../common/js/constant.js?__UPDATEID__"></script>
......@@ -58,7 +57,7 @@
</div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrint" ></div>
<div class="container-wrap mb-5" id="pdfPrintDiv" ></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
......
abweb/html/pickup.html
......@@ -31,8 +31,7 @@
<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="../js/topPage/topPage.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/pickup/pickup.js"></script>
<script type="text/javascript" src="../js/pickup/pickup.js?__UPDATEID__"></script>
<script type="text/javascript">
$(document).ready(function(){
......
abweb/html/pushMessageDetail.html
......@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="messageDetail"></title>
<title class="lang" lang="pushMessageDetail"></title>
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
......
abweb/html/pushMessageList.html
......@@ -4,7 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="messageListTitle"></title>
<title class="lang" lang="pushMessageList"></title>
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
......
abweb/html/sendMessage.html
......@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title class="lang" lang="sendMessageTitle"></title>
<title class="lang" lang="sendMessage"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
......
abweb/js/dashboard/dashboard.js
......@@ -13,8 +13,8 @@ DASHBOARD.pickupItems = [
/** comunication dashboard configuration */
DASHBOARD.communicationItems = [
{ id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'messageListTitle' },
{ id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessageTitle' },
{ id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'pushMessageList' },
{ id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessage' },
];
/** Default dashboard setting data */
......
abweb/js/operationList/operationList.js
......@@ -22,11 +22,11 @@ OL.operationGroupMasterId;
*/
OL.init = function () {
console.log('OperationList start');
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', null, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
TEMPLATE.loadConfirmModal('#includedConfirmModal');
//get all data of operation list scene
OL.getAllDataWeb(sessionStorage.OL_searchKeyWord, sessionStorage.OL_sortIndex, sessionStorage.OL_searchStartDate, sessionStorage.OL_searchEndDate, sessionStorage.OL_operationGroupMasterId);
......@@ -316,7 +316,7 @@ OL.createCategoryList = function () {
//create category(operationGroupMaster) structure
for (let i = 0; i < OL.operationGroupMaster.length; i++) {
const item = OL.operationGroupMaster[i];
console.log(item);
// console.log(item);
let inputLabel = $('<label>');
let inputRadio = $('<input type="radio" name="category">');
inputRadio.val(item.operationGroupMasterId);
......@@ -503,9 +503,6 @@ 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
......@@ -27,7 +27,7 @@ PP.init = function () {
PP.loadCommon = function () {
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pdfPrint', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pdfPrint', true, null);
};
/**
......@@ -40,7 +40,7 @@ PP.initPdfList = function () {
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);
$('#pdfPrintDiv').load(url, params);
} else {
COMMON.displayAlert('error');
COMMON.avwScreenMove('reportList.html');
......
abweb/js/pickup/pickup.js
......@@ -139,16 +139,7 @@ PICKUP.init = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
},
{
titleLang: 'pickup',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', true, null);
PICKUP.initSettingActivePickup();
PICKUP.settingPickup();
COMMON.closeLoading();
......@@ -324,7 +315,7 @@ PICKUP.createNewReportList = function (operationListOld) {
}
let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
let ahrefRequiredFlg = $(
'<a href="javascript:PICKUP.sendReportFormFromNewReport (\'' + operationList[i].operationId + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>",
'<a href="javascript:PICKUP.sendReportFormFromNewReport (\'' + operationList[i].operationId + "," + operationList[i].addReport + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>",
);
let divIcon = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'>" + "<div class='type-icon'>" + "<span class='" + classIcon + "'></span>" + '</div></div>');
......@@ -745,9 +736,9 @@ PICKUP.getInspectDate = function (dateString) {
* @param operarionId
* @returns
*/
PICKUP.sendReportFormFromNewReport = function (operationId) {
PICKUP.sendReportFormFromNewReport = function (operationId, addReport) {
//Transition to the report form or operation list screen
const url = 'reportForm.html?operationId=' + operationId;
const url = 'reportForm.html?operationId=' + operationId + "&addReport=" + addReport;
COMMON.avwScreenMove(url);
};
......
abweb/js/pushMessageDetail/pushMessageDetail.js
......@@ -26,20 +26,7 @@ PushMessageDetail.init = function () {
COMMON.checkAuth(false);
//load common html
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
},
{
titleLang: 'messageListTitle',
href: 'pushMessageList.html',
},
{
titleLang: 'messageDetail',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageDetail', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageDetail', true, null);
//request message detail data
let urlParam = COMMON.getUrlParameter();
if (typeof urlParam !== 'object' || typeof urlParam.pushMessageId === 'undefined') {
......
abweb/js/pushMessageList/pushMessageList.js
......@@ -12,16 +12,7 @@ PushMessageList.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
},
{
titleLang: 'messageListTitle',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageListTitle', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pushMessageList', true, null);
PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList);
});
......
abweb/js/reportList/reportList.js
......@@ -25,30 +25,7 @@ RL.init = function () {
RL.loadCommon = function () {
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
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);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'reportList', true, RL.loadMainTitleCallback);
};
RL.isQuickReport;
......
abweb/js/sendMessage/sendMessage.js
......@@ -121,16 +121,7 @@ SendMessage.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
},
{
titleLang: 'sendMessageTitle',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessageTitle', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessage', true, null);
TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback);
TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback);
$('#messageContent').attr('maxlength', SendMessage.contentMaxLength);
......
abweb/js/setting/settings.js
......@@ -150,16 +150,7 @@ SETTINGS.getNewPasswordRe = function () {
SETTINGS.initScreen = function () {
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
titleLang: 'txtTooltipBack',
href: 'javascript:history.back();',
},
{
titleLang: 'account_setting',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', '', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'accountSetting', true, null);
// Login ID
$('#txtLoginId').text(ClientData.userInfo_loginId_session());
// Account Path
......
abweb/js/template/template.js
......@@ -9,7 +9,7 @@ TEMPLATE.loadHeader = function (elmentId) {
$(elmentId).load('../common/html/header.html', function () {
$('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active');
if (sessionStorage.activeHomePage == CONSTANT.PAGE_NAME.OPERATION_LIST) {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.OPERATION_LIST) {
$('#iconHomeWorkList').addClass('active');
} else {
$('#iconHomeDashboard').addClass('active');
......@@ -81,22 +81,40 @@ 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) {
TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, isNav, completeCallback) {
var titleHtmlPath = '../common/html/mainTitle.html';
if (navs) {
HEADER.urlTree();
var navs;
if (isNav) {
titleHtmlPath = '../common/html/mainNavTitle.html';
navs = sessionStorage.urlTree ? JSON.parse(sessionStorage.urlTree) : null;
}
$(elmentId).load(titleHtmlPath, function (data) {
$(elmentId).replaceWith(data);
if (titleLang) {
$('#mainTitleHeader').attr('lang', titleLang);
}
if (navs) {
if (isNav) {
if (titleLang == "accountSetting") {
navs = [
{
titleLang: 'txtTooltipBack',
href: 'javascript:history.back();',
},
{
titleLang: 'accountSetting',
},
];
}
var olElm = $('#mainTitleNavs ol');
for (var i = 0; i < navs.length; i++) {
const nav = navs[i];
console.log("kdh check nav titleLang : " + nav.titleLang);
console.log("kdh check nav[href] : " + nav.href);
var liElm = $('<li class="breadcrumb-item" />');
if (nav.href) {
if (nav.href && i != navs.length -1) {
var aElm = $('<a class="text-decoration-none text-underline lang" />');
aElm.attr('href', nav.href);
if (nav.titleLang) {
......
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