Skip to content

C
check
Commit 0f932207 by Takumi Imai
Options

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

constant footer operationLIst topPageの名前を変更

See merge request !3
parents 1578f03d 88d0aff8
Showing with 152 additions and 162 deletions
abvw/common/js/appCommon/check-common.js
...@@ -21,12 +21,12 @@ CHK_Common.lang; ...@@ -21,12 +21,12 @@ CHK_Common.lang;
*/ */
CHK_Common.setLangCodeWeb = function () { CHK_Common.setLangCodeWeb = function () {
let lang = CHK_Common.getLangWeb(); let lang = CHK_Common.getLangWeb();
if (lang.split('-')[0] == CHK_CONSTANT.LANG.English) { if (lang.split('-')[0] == CONSTANT.LANG.English) {
lang = CHK_CONSTANT.LANG.ENGLISH; lang = CONSTANT.LANG.ENGLISH;
} else if (lang.split('-')[0] == CHK_CONSTANT.LANG.KOREA) { } else if (lang.split('-')[0] == CONSTANT.LANG.KOREA) {
lang = CHK_CONSTANT.LANG.KOREA; lang = CONSTANT.LANG.KOREA;
} else { } else {
lang = CHK_CONSTANT.LANG.JAPAN; lang = CONSTANT.LANG.JAPAN;
} }
CHK_Common.lang = lang; CHK_Common.lang = lang;
}; };
...@@ -39,11 +39,11 @@ CHK_Common.setLangCodeWeb = function () { ...@@ -39,11 +39,11 @@ CHK_Common.setLangCodeWeb = function () {
CHK_Common.getLangWeb = function () { CHK_Common.getLangWeb = function () {
if (!CHK_Common.lang) { if (!CHK_Common.lang) {
let pageLang; let pageLang;
if (localStorage[CHK_CONSTANT.LANG.SAVE_NAME]) { if (localStorage[CONSTANT.LANG.SAVE_NAME]) {
pageLang = localStorage[CHK_CONSTANT.LANG.SAVE_NAME]; pageLang = localStorage[CONSTANT.LANG.SAVE_NAME];
} else { } else {
pageLang = (window.navigator.languages && window.navigator.languages[0]) || window.navigator.language || window.navigator.userLanguage || window.navigator.browserLanguage; pageLang = (window.navigator.languages && window.navigator.languages[0]) || window.navigator.language || window.navigator.userLanguage || window.navigator.browserLanguage;
localStorage[CHK_CONSTANT.LANG.SAVE_NAME] = pageLang; localStorage[CONSTANT.LANG.SAVE_NAME] = pageLang;
} }
return pageLang; return pageLang;
} else { } else {
...@@ -81,7 +81,7 @@ CHK_Common.updateLang = function () { ...@@ -81,7 +81,7 @@ CHK_Common.updateLang = function () {
* @returns String msg * @returns String msg
*/ */
CHK_Common.getMsg = function (key) { CHK_Common.getMsg = function (key) {
const msg = CHK_CONSTANT.MSG_MAP[key]; const msg = CONSTANT.MSG_MAP[key];
if (!msg) { if (!msg) {
return ''; return '';
} }
...@@ -165,7 +165,7 @@ CHK_Common.alertClose = function () { ...@@ -165,7 +165,7 @@ CHK_Common.alertClose = function () {
*/ */
CHK_Common.goUrlWithCurrentParams = function (url, params) { CHK_Common.goUrlWithCurrentParams = function (url, params) {
if (!params) { if (!params) {
location.href = CHK_CONSTANT.URL.BASE_WEB + url; location.href = CONSTANT.URL.BASE_WEB + url;
} }
const mixParams = Object.assign(CHK_Common.getUrlParameter(), params); const mixParams = Object.assign(CHK_Common.getUrlParameter(), params);
...@@ -203,7 +203,7 @@ CHK_Common.getUrlParameter = function () { ...@@ -203,7 +203,7 @@ CHK_Common.getUrlParameter = function () {
* @returns sid * @returns sid
*/ */
CHK_Common.getSid = function () { CHK_Common.getSid = function () {
return ClientData.userInfo_sid_local(); return ClientData.userInfo_sid_local();
}; };
/** /**
...@@ -228,7 +228,7 @@ CHK_Common.cmsAjax = function (url, param, async = true, callback, errorCallback ...@@ -228,7 +228,7 @@ CHK_Common.cmsAjax = function (url, param, async = true, callback, errorCallback
if (result.status == '200') { if (result.status == '200') {
if (callback) callback(result); if (callback) callback(result);
} else if (result.status == '401') { } else if (result.status == '401') {
CHK_Common.goUrlWithCurrentParams(CHK_CONSTANT.PAGE_NAME.LOGIN); CHK_Common.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
} else if (errorCallback) { } else if (errorCallback) {
errorCallback(); errorCallback();
} else { } else {
...@@ -289,8 +289,8 @@ CHK_Common.postCommunication = function (url, params, method = 'post') { ...@@ -289,8 +289,8 @@ CHK_Common.postCommunication = function (url, params, method = 'post') {
CHK_Common.checkAuth = function (async = true) { CHK_Common.checkAuth = function (async = true) {
let params = {}; let params = {};
params.sid = CHK_Common.getSid; params.sid = CHK_Common.getSid;
const url = CHK_CONSTANT.URL.BASE_CMS + CHK_CONSTANT.URL.AUTH_SESSION; const url = CONSTANT.URL.BASE_CMS + CONSTANT.URL.AUTH_SESSION;
CHK_Common.cmsAjax(url, params, async, null, function () { CHK_Common.cmsAjax(url, params, async, null, function () {
CHK_Common.goUrlWithCurrentParams(CHK_CONSTANT.PAGE_NAME.LOGIN); CHK_Common.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
}); });
}; };
abvw/common/js/appCommon/constant.js → abvw/common/js/constant.js
/** /**
* constant js * constant js
* *
* @since 1.4.3.2 & 1.4.3.3 * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
const CHK_CONSTANT = {}; const CONSTANT = {};
CHK_CONSTANT.SORT_TYPE = { CONSTANT.SORT_TYPE = {
NAME: 0, NAME: 0,
START_DATE_DESC: 1, START_DATE_DESC: 1,
START_DATE_ASC: 2, START_DATE_ASC: 2,
...@@ -13,7 +13,7 @@ CHK_CONSTANT.SORT_TYPE = { ...@@ -13,7 +13,7 @@ CHK_CONSTANT.SORT_TYPE = {
LAST_EDIT_DATE: 4, LAST_EDIT_DATE: 4,
}; };
CHK_CONSTANT.PAGE_NAME = { CONSTANT.PAGE_NAME = {
DASHBOARD: 'dashboard', DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList', OPERATION_LIST: 'operationList',
FOOTER: 'main-footer.html', FOOTER: 'main-footer.html',
...@@ -21,45 +21,45 @@ CHK_CONSTANT.PAGE_NAME = { ...@@ -21,45 +21,45 @@ CHK_CONSTANT.PAGE_NAME = {
LOGIN: 'login.html', LOGIN: 'login.html',
}; };
CHK_CONSTANT.PAGE_TAB = { CONSTANT.PAGE_TAB = {
DASHBOARD: 'dashboard', DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList', OPERATION_LIST: 'operationList',
}; };
CHK_CONSTANT.OPERATION_TYPE = { CONSTANT.OPERATION_TYPE = {
LIST: '0', LIST: '0',
DRAWING: '1', DRAWING: '1',
VTOUR: '2', VTOUR: '2',
PDF: '3', PDF: '3',
}; };
CHK_CONSTANT.REPORT_TYPE = { CONSTANT.REPORT_TYPE = {
REPORTONLY: '0', REPORTONLY: '0',
INSPECT: '1', INSPECT: '1',
WITHREPLY: '2', WITHREPLY: '2',
WORKFLOW: '3', WORKFLOW: '3',
}; };
CHK_CONSTANT.ADD_REPORT_FLG = { CONSTANT.ADD_REPORT_FLG = {
UNABLE: '0', UNABLE: '0',
ABLE: '1', ABLE: '1',
}; };
CHK_CONSTANT.URL = { CONSTANT.URL = {
BASE_CMS: 'https://' + location.host + '/checkapi/web/', BASE_CMS: 'https://' + location.host + '/checkapi/web/',
BASE_WEB: 'abvw/html/', BASE_WEB: 'abvw/html/',
ALL_OPERATION_LIST: 'operationLIstWeb/getOperationList', ALL_OPERATION_LIST: 'operationLIstWeb/getOperationList',
AUTH_SESSION: 'getsession/checkAuthUser', AUTH_SESSION: 'getsession/checkAuthUser',
}; };
CHK_CONSTANT.LANG = { CONSTANT.LANG = {
SAVE_NAME: 'lang', SAVE_NAME: 'lang',
JAPAN: 'ja', JAPAN: 'ja',
KOREA: 'ko', KOREA: 'ko',
ENGLISH: 'en', ENGLISH: 'en',
}; };
CHK_CONSTANT.MSG_MAP = { CONSTANT.MSG_MAP = {
all: { ja: '全て', ko: '전체', en: 'All' }, all: { ja: '全て', ko: '전체', en: 'All' },
dateError: { ja: '開始日は終了日の前に設定してください。', ko: '잘못된 검색일입니다.', en: 'Please enter correct search date.' }, dateError: { ja: '開始日は終了日の前に設定してください。', ko: '잘못된 검색일입니다.', en: 'Please enter correct search date.' },
operationListTitle: { ja: 'トップページ｜A Book Check', ko: '톱 페이지｜A Book Check', en: 'Top Page｜A Book Check' }, operationListTitle: { ja: 'トップページ｜A Book Check', ko: '톱 페이지｜A Book Check', en: 'Top Page｜A Book Check' },
......
abvw/common/js/appCommon/check-footer.js → abvw/common/js/footer.js
/** /**
* Common js for footer. * Common js for footer.
* ※Code is written mainly for dashboard and operationList. * ※Code is written mainly for dashboard and operationList.
* *
* @since cms:1.4.3.2&1.4.3.3 web:1.0 * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var CHK_Footer = {}; var FOOTER = {};
/** /**
* Change specific footer bottom to active. * Change specific footer bottom to active.
* *
* @param {String} bottomNavId * @param {String} bottomNavId
*/ */
CHK_Footer.activeBottomNav = function(bottomNavId) { FOOTER.activeBottomNav = function (bottomNavId) {
let elm = $("#" + bottomNavId); let elm = $('#' + bottomNavId);
if (typeof elm !== 'object') { if (typeof elm !== 'object') {
console.log('CHK_Footer.activeBottomNav:elm !== object:' + bottomNavId); console.log('FOOTER.activeBottomNav:elm !== object:' + bottomNavId);
return; return;
} }
elm.removeClass('text-secondary'); elm.removeClass('text-secondary');
elm.addClass("text-primary"); elm.addClass('text-primary');
let img = elm.find("img")[0]; let img = elm.find('img')[0];
if (img && img.getAttribute("data-src")) { if (img && img.getAttribute('data-src')) {
img.src = img.getAttribute("data-src"); img.src = img.getAttribute('data-src');
} }
} };
/** /**
* change inactive all footer bottom * change inactive all footer bottom
*/ */
CHK_Footer.inactiveAllBottomNav = function() { FOOTER.inactiveAllBottomNav = function () {
let navs = document.getElementsByClassName("bottom-nav"); let navs = document.getElementsByClassName('bottom-nav');
for (i = 0; i < navs.length; i++) { for (i = 0; i < navs.length; i++) {
navs[i].className = navs[i].className.replace("text-primary", "text-secondary"); navs[i].className = navs[i].className.replace('text-primary', 'text-secondary');
let img = navs[i].querySelector("img"); let img = navs[i].querySelector('img');
if (img && img.getAttribute('data-inactive-src')) { if (img && img.getAttribute('data-inactive-src')) {
img.src = img.getAttribute('data-inactive-src'); img.src = img.getAttribute('data-inactive-src');
} }
} }
} };
/** /**
* Go page of index.html. * Go page of index.html.
* Store tab id in session for want to show display. * Store tab id in session for want to show display.
* *
* @param {String} tabId * @param {String} tabId
*/ */
CHK_Footer.goIndexPage = function(tabId) { FOOTER.goIndexPage = function (tabId) {
sessionStorage.activeTab = tabId; sessionStorage.activeTab = tabId;
CHK_Common.goUrlWithCurrentParams(DAFAULT_PAGE); CHK_Common.goUrlWithCurrentParams(DAFAULT_PAGE);
} };
/** /**
* is the url index.html? * is the url index.html?
*/ */
CHK_Footer.isIndexPage = function() { FOOTER.isIndexPage = function () {
if (typeof location === 'object' && typeof location.pathname === 'string') { if (typeof location === 'object' && typeof location.pathname === 'string') {
if (location.pathname.includes(CHK_CONSTANT.PAGE_NAME.DEFAULT) == true) { if (location.pathname.includes(CONSTANT.PAGE_NAME.DEFAULT) == true) {
return true; return true;
} }
} }
return false; return false;
} };
/** /**
* Initialize with any navigation * Initialize with any navigation
* *
* @param {String} bottomNav * @param {String} bottomNav
*/ */
CHK_Footer.activeInitBottomNav = function(bottomNav) { FOOTER.activeInitBottomNav = function (bottomNav) {
CHK_Footer.inactiveAllBottomNav(); FOOTER.inactiveAllBottomNav();
CHK_Footer.activeBottomNav(bottomNav); FOOTER.activeBottomNav(bottomNav);
} };
/** /**
* Go page of dashboard * Go page of dashboard
*/ */
CHK_Footer.goDashboard = function() { FOOTER.goDashboard = function () {
sessionStorage.activeTab = CHK_CONSTANT.PAGE_TAB.DASHBOARD; sessionStorage.activeTab = CONSTANT.PAGE_TAB.DASHBOARD;
CHK_Footer.activeInitBottomNav('dashboardBottomNav'); FOOTER.activeInitBottomNav('dashboardBottomNav');
if (CHK_Footer.isIndexPage()) { if (FOOTER.isIndexPage()) {
CHK_TOP.showPage(CHK_CONSTANT.PAGE_NAME.DASHBOARD); TOP.showPage(CONSTANT.PAGE_NAME.DASHBOARD);
return; return;
} }
CHK_Footer.goIndexPage(CHK_CONSTANT.PAGE_NAME.DASHBOARD); FOOTER.goIndexPage(CONSTANT.PAGE_NAME.DASHBOARD);
} };
/** /**
* Go page of operationList * Go page of operationList
*/ */
CHK_Footer.goOperationList = function() { FOOTER.goOperationList = function () {
sessionStorage.activeTab = CHK_CONSTANT.PAGE_TAB.OPERATION_LIST; sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
CHK_Footer.activeInitBottomNav('operationListBottomNav'); FOOTER.activeInitBottomNav('operationListBottomNav');
if (CHK_Footer.isIndexPage()) { if (FOOTER.isIndexPage()) {
CHK_TOP.showPage(CHK_CONSTANT.PAGE_NAME.OPERATION_LIST); TOP.showPage(CONSTANT.PAGE_NAME.OPERATION_LIST);
return; return;
} }
CHK_Footer.goIndexPage(CHK_CONSTANT.PAGE_NAME.OPERATION_LIST); FOOTER.goIndexPage(CONSTANT.PAGE_NAME.OPERATION_LIST);
} };
/** /**
* Go to active tab when footer was loaded. * Go to active tab when footer was loaded.
* If it is no active tab, go to page in settings. * If it is no active tab, go to page in settings.
*/ */
CHK_Footer.initFooter = function() { FOOTER.initFooter = function () {
$("#footer").load(CHK_CONSTANT.PAGE_NAME.FOOTER, function() { $('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () {
if (typeof sessionStorage != 'undefined' && typeof sessionStorage.activeTab != 'undefined') {
if (typeof sessionStorage != 'undefined' && typeof sessionStorage.activeTab != 'undefined') { if (sessionStorage.activeTab == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.activeTab == CHK_CONSTANT.PAGE_TAB.DASHBOARD) { FOOTER.goDashboard();
CHK_Footer.goDashboard(); } else {
} else { FOOTER.goOperationList();
CHK_Footer.goOperationList(); }
} return;
return; }
}
FOOTER.goOperationList();
CHK_Footer.goOperationList(); // CHK.loadDashboardSetting(function() {
// CHK.loadDashboardSetting(function() { // if (CHK.dashboardSetting.dashboardHome) {
// if (CHK.dashboardSetting.dashboardHome) { // FOOTER.goDashboard();
// CHK_Footer.goDashboard(); // } else {
// } else { // FOOTER.goOperationList();
// CHK_Footer.goOperationList(); // }
// } // });
// }); });
}); };
}
\ No newline at end of file
abvw/html/index.html
...@@ -14,22 +14,22 @@ ...@@ -14,22 +14,22 @@
<link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/app.css"> <link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/app.css">
<link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/fontawesome_relative_path.css"> <link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/fontawesome_relative_path.css">
<script src="/abvw/common/js/appCommon/constant.js?__UPDATEID__"></script> <script src="/abvw/common/js/constant.js?__UPDATEID__"></script>
<script src="/abvw/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script> <script src="/abvw/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script src="/abvw/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script> <script src="/abvw/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script src="/abvw/js/operationList/operationList.js?__UPDATEID__"></script> <script src="/abvw/js/operationList/operationList.js?__UPDATEID__"></script>
<script src="/abvw/js/topPage/topPage.js?__UPDATEID__"></script> <script src="/abvw/js/topPage/topPage.js?__UPDATEID__"></script>
<script src="/abvw/js/dashboardSetting/check-dashboard-setting.js?__UPDATEID__"></script> <script src="/abvw/js/dashboardSetting/check-dashboard-setting.js?__UPDATEID__"></script>
<script src="/abvw/js/dashboard/check-dashboard.js?__UPDATEID__"></script> <script src="/abvw/js/dashboard/check-dashboard.js?__UPDATEID__"></script>
<script src="/abvw/common/js/appCommon/check-footer.js?__UPDATEID__"></script> <script src="/abvw/common/js/footer.js?__UPDATEID__"></script>
<script src="/abvw/common/js/appCommon/check-common.js?__UPDATEID__"></script> <script src="/abvw/common/js/appCommon/check-common.js?__UPDATEID__"></script>
<script src="/abvw/common/js/web/common.js?__UPDATEID__"></script> <script src="/abvw/common/js/web/common.js?__UPDATEID__"></script>
<script src="/abvw/common/js/web/avweb.js?__UPDATEID__"></script> <script src="/abvw/common/js/web/avweb.js?__UPDATEID__"></script>
<script src="/abvw/common/js/appCommon/app.js?__UPDATEID__" defer></script> <script src="/abvw/common/js/app.js?__UPDATEID__" defer></script>
</head> </head>
<body onload="CHK_TOP.init();" style="position: relative; margin-top: 53px;"> <body onload="TOP.init();" style="position: relative; margin-top: 53px;">
<!--作業一覧画面--> <!--作業一覧画面-->
<section id="operationList" class="page-content" style="display: none;"> <section id="operationList" class="page-content" style="display: none;">
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<header style="position: fixed; width: 100%; top: 0px; left: 0; z-index: 999;"> <header style="position: fixed; width: 100%; top: 0px; left: 0; z-index: 999;">
<nav class="navbar navbar-dark bg-primary"> <nav class="navbar navbar-dark bg-primary">
<div> <div>
<a class="navbar-brand category-btn lht-0 d-none" onclick="CHK_OL.openCategory();" id="operationGroupMasterButton"> <a class="navbar-brand category-btn lht-0 d-none" onclick="OL.openCategory();" id="operationGroupMasterButton">
<i class="fa fa-folder fs-12 p-1" id="category-toggle-button"></i> <i class="fa fa-folder fs-12 p-1" id="category-toggle-button"></i>
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonCategory"></span> <span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonCategory"></span>
</a> </a>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<nav id="category-menu" class="drawer-menu"> <nav id="category-menu" class="drawer-menu">
<div class="d-flex justifyfont-weight-bold fs-13 p-3 mb-0 multi-lang" data-msg="buttonCategory"></h2> <div class="d-flex justifyfont-weight-bold fs-13 p-3 mb-0 multi-lang" data-msg="buttonCategory"></h2>
<a class="category-content-between border-bottom"> <a class="category-content-between border-bottom">
<h2 class="text-nowrap -btn p-3" onclick="CHK_OL.openCategory();" href="#"><i class="fa fa-times"></i></a> <h2 class="text-nowrap -btn p-3" onclick="OL.openCategory();" href="#"><i class="fa fa-times"></i></a>
</div> </div>
</nav> </nav>
</section> </section>
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<div class="form-group has-search input-group"> <div class="form-group has-search input-group">
<input type="text" class="form-control multi-lang" data-msg="placeholderOperationName" placeholder="placeholderOperationName" id="searchTaskName"> <input type="text" class="form-control multi-lang" data-msg="placeholderOperationName" placeholder="placeholderOperationName" id="searchTaskName">
<div class="input-group-append"> <div class="input-group-append">
<i class="fas fa-search input-group-text" onclick="CHK_OL.search();"></i> <i class="fas fa-search input-group-text" onclick="OL.search();"></i>
</div> </div>
</div> </div>
</div> </div>
...@@ -124,12 +124,12 @@ ...@@ -124,12 +124,12 @@
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelSort"></span> <span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelSort"></span>
</a> </a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortName" data-sort="0" onclick="CHK_OL.changeSortType(this);"></a> <a class="dropdown-item sort-type multi-lang" data-msg="labelSortName" data-sort="0" onclick="OL.changeSortType(this);"></a>
<a class="dropdown-item sort-type active multi-lang" data-msg="labelSortNew" data-sort="1" id="defaultSort" onclick="CHK_OL.changeSortType(this);"></a> <a class="dropdown-item sort-type active multi-lang" data-msg="labelSortNew" data-sort="1" id="defaultSort" onclick="OL.changeSortType(this);"></a>
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortOld" data-sort="2" onclick="CHK_OL.changeSortType(this);"></a> <a class="dropdown-item sort-type multi-lang" data-msg="labelSortOld" data-sort="2" onclick="OL.changeSortType(this);"></a>
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortOpen" data-sort="4" onclick="CHK_OL.changeSortType(this);"></a> <a class="dropdown-item sort-type multi-lang" data-msg="labelSortOpen" data-sort="4" onclick="OL.changeSortType(this);"></a>
</div> </div>
<a href="javascript:CHK_OL.resetSearch();" class="text-decoration-none py-2 lht-0 d-inline-block ml-3"> <a href="javascript:OL.resetSearch();" class="text-decoration-none py-2 lht-0 d-inline-block ml-3">
<img class="icon" src="/abvw/img/operationList/icon_clear.svg"> <img class="icon" src="/abvw/img/operationList/icon_clear.svg">
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelReset" lnag="labelReset"></span> <span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelReset" lnag="labelReset"></span>
</a> </a>
......
abvw/html/main-footer.html
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<nav class="d-flex justify-content-around"> <nav class="d-flex justify-content-around">
<!--ダッシュボード--> <!--ダッシュボード-->
<a id="dashboardBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav" href="javascript:CHK_Footer.goDashboard();"> <a id="dashboardBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav" href="javascript:FOOTER.goDashboard();">
<img src="/abvw/img/dashboard/icon_dashboard_inactive.svg" data-inactive-src="/abvw/img/dashboard/icon_dashboard_inactive.svg" data-src="/abvw/img/dashboard/icon_dashboard.svg" alt="buttonDashboard" class="p-1"> <img src="/abvw/img/dashboard/icon_dashboard_inactive.svg" data-inactive-src="/abvw/img/dashboard/icon_dashboard_inactive.svg" data-src="/abvw/img/dashboard/icon_dashboard.svg" alt="buttonDashboard" class="p-1">
<div class="fs-7 multi-lang" data-msg="buttonDashboard"></div> <div class="fs-7 multi-lang" data-msg="buttonDashboard"></div>
</a> </a>
<!--作業一覧--> <!--作業一覧-->
<a id="operationListBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-primary bottom-nav" href="javascript:CHK_Footer.goOperationList();"> <a id="operationListBottomNav" class="d-block w-100 text-center py-2 text-decoration-none text-primary bottom-nav" href="javascript:FOOTER.goOperationList();">
<i class="fas fa-tasks fs-14 p-1"></i> <i class="fas fa-tasks fs-14 p-1"></i>
<div class="fs-7 multi-lang" data-msg="buttonOperationList"></div> <div class="fs-7 multi-lang" data-msg="buttonOperationList"></div>
</a> </a>
......
abvw/js/dashboardSetting/check-dashboard-setting.js
var CHK_DashboardSetting = {}; var CHK_DashboardSetting = {};
CHK_DashboardSetting.displayItems = [ CHK_DashboardSetting.displayItems = [
{ id:'newReport', name: 'chk-new', enabled: true, title:'新規報告', msg: 'dashboardSettingNewRegistrationTitle'}, { id: 'newReport', name: 'chk-new', enabled: true, title: '新規報告', msg: 'dashboardSettingNewRegistrationTitle' },
{ id:'continousWork', name: 'chk-proccess', enabled: true, title:'工程作業', msg: 'dashboardSettingContinousWorkTitle'}, { id: 'continousWork', name: 'chk-proccess', enabled: true, title: '工程作業', msg: 'dashboardSettingContinousWorkTitle' },
{ id:'reportWarning', name: 'chk-alert', enabled: true, title:'警告を含む作業', msg: 'dashboardSettingReportWarningTitle'}, { id: 'reportWarning', name: 'chk-alert', enabled: true, title: '警告を含む作業', msg: 'dashboardSettingReportWarningTitle' },
{ id:'dashboardHome', name: 'chk-home', enabled: false, title:'ダッシュボードをホーム画面にする', msg: 'dashboardSettingDashboardHomeTitle'}, { id: 'dashboardHome', name: 'chk-home', enabled: false, title: 'ダッシュボードをホーム画面にする', msg: 'dashboardSettingDashboardHomeTitle' },
]; ];
//CHK_DashboardSetting.displayItemsに設定されている情報から✓されている項目をhtml上に設定する //CHK_DashboardSetting.displayItemsに設定されている情報から✓されている項目をhtml上に設定する
CHK_DashboardSetting.loadSettings = function() { CHK_DashboardSetting.loadSettings = function () {
CHK_DashboardSetting.displayItems.forEach(function(item) { CHK_DashboardSetting.displayItems.forEach(function (item) {
let enabled = CHK.dashboardSetting[item.id]; let enabled = CHK.dashboardSetting[item.id];
if (typeof enabled !== 'undefined') { if (typeof enabled !== 'undefined') {
item.enabled = enabled; item.enabled = enabled;
...@@ -17,50 +17,47 @@ CHK_DashboardSetting.loadSettings = function() { ...@@ -17,50 +17,47 @@ CHK_DashboardSetting.loadSettings = function() {
itemElement.addClass('checked'); itemElement.addClass('checked');
} else { } else {
itemElement.removeClass('checked'); itemElement.removeClass('checked');
} }
} }
}); });
} };
//CHK_DashboardSetting.displayItemsに設定を書き込む //CHK_DashboardSetting.displayItemsに設定を書き込む
CHK_DashboardSetting.saveSetting = function(key, enabled) { CHK_DashboardSetting.saveSetting = function (key, enabled) {
CHK_DashboardSetting.displayItems.forEach(function(item) { CHK_DashboardSetting.displayItems.forEach(function (item) {
if (item.id == key) { if (item.id == key) {
item.enabled = enabled; item.enabled = enabled;
} }
}); });
CHK.saveDashboardSetting(key, enabled); CHK.saveDashboardSetting(key, enabled);
} };
//CHK_DashboardSetting.displayItemsからhtmlに設定画面を表示する //CHK_DashboardSetting.displayItemsからhtmlに設定画面を表示する
CHK_DashboardSetting.initDisplays = function() { CHK_DashboardSetting.initDisplays = function () {
$("#displayItems tbody").empty(); $('#displayItems tbody').empty();
CHK_DashboardSetting.displayItems.forEach(function(item) { CHK_DashboardSetting.displayItems.forEach(function (item) {
var html = CHK_DashboardSetting.initHtmlItem(item); var html = CHK_DashboardSetting.initHtmlItem(item);
$("#displayItems tbody").append(html); $('#displayItems tbody').append(html);
}); });
} };
//設定画面に表示するhtmlを生成する //設定画面に表示するhtmlを生成する
CHK_DashboardSetting.initHtmlItem = function(item) { CHK_DashboardSetting.initHtmlItem = function (item) {
var titleDiv = '<div class="font-weight-normal text-dark multi-lang" data-msg="' + item.msg + '">' + item.title +'</div>'; var titleDiv = '<div class="font-weight-normal text-dark multi-lang" data-msg="' + item.msg + '">' + item.title + '</div>';
var toggleClass = 'toggle'; var toggleClass = 'toggle';
if (item.enabled) { if (item.enabled) {
toggleClass += ' checked'; toggleClass += ' checked';
} }
var toggleDiv = '<div id="' + item.id + '" class="' + toggleClass + '"><input type="checkbox" name="' + item.name + '" /></div>'; var toggleDiv = '<div id="' + item.id + '" class="' + toggleClass + '"><input type="checkbox" name="' + item.name + '" /></div>';
var html = $('<tr>' var html = $('<tr>' + '<th>' + titleDiv + '</th>' + '<td>' + toggleDiv + '</td>' + '</tr>');
+ '<th>' + titleDiv + '</th>'
+ '<td>' + toggleDiv + '</td>'
+ '</tr>');
return html; return html;
} };
//設定画面でクリックされてた時の処理 //設定画面でクリックされてた時の処理
// //
CHK_DashboardSetting.bindToggleClick = function() { CHK_DashboardSetting.bindToggleClick = function () {
$(".toggle").on("click", function() { $('.toggle').on('click', function () {
$(this).toggleClass("checked"); $(this).toggleClass('checked');
var id = $(this).attr('id'); var id = $(this).attr('id');
var enabled = false; var enabled = false;
if ($(this).hasClass('checked')) { if ($(this).hasClass('checked')) {
...@@ -68,22 +65,22 @@ CHK_DashboardSetting.bindToggleClick = function() { ...@@ -68,22 +65,22 @@ CHK_DashboardSetting.bindToggleClick = function() {
} }
CHK_DashboardSetting.saveSetting(id, enabled); CHK_DashboardSetting.saveSetting(id, enabled);
}); });
} };
//設定画面の初期処理 //設定画面の初期処理
CHK_DashboardSetting.init = function() { CHK_DashboardSetting.init = function () {
CHK.initCommon(); CHK.initCommon();
$("#footer").load("main-footer.html", function() { $('#footer').load('main-footer.html', function () {
CHK_Footer.activeDashboardBottomNav(); FOOTER.activeDashboardBottomNav();
}); });
CHK.loadDashboardSetting(function() { CHK.loadDashboardSetting(function () {
CHK_DashboardSetting.loadSettings(); CHK_DashboardSetting.loadSettings();
CHK_DashboardSetting.initDisplays(); CHK_DashboardSetting.initDisplays();
CHK_DashboardSetting.bindToggleClick(); CHK_DashboardSetting.bindToggleClick();
}); });
} };
//戻るボタン //戻るボタン
CHK_DashboardSetting.goBack = function() { CHK_DashboardSetting.goBack = function () {
CHK_Footer.goDashboard(); FOOTER.goDashboard();
} };
\ No newline at end of file
abvw/js/topPage/topPage.js
/** /**
* common js of top page. * common js of top page.
* top page is dashboard and operationList. * top page is dashboard and operationList.
* *
* @since cms:1.4.3.2&1.4.3.3 web:1.0 * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var CHK_TOP = {}; var TOP = {};
$(document).ready(function () { $(document).ready(function () {
//setting lang info //setting lang info
CHK_Common.setLangCodeWeb(); CHK_Common.setLangCodeWeb();
//Check if user is logged in //Check if user is logged in
CHK_Common.checkAuth(false); CHK_Common.checkAuth(false);
...@@ -22,34 +21,32 @@ $(document).ready(function () { ...@@ -22,34 +21,32 @@ $(document).ready(function () {
/** /**
* show page * show page
*/ */
CHK_TOP.init = function() { TOP.init = function () {
CHK_Common.showLoading(); CHK_Common.showLoading();
CHK_Footer.initFooter();//app should get data after initFooter FOOTER.initFooter(); //app should get data after initFooter
CHK_Common.closeLoading(); CHK_Common.closeLoading();
}; };
/** /**
* Show page by arbitrary id * Show page by arbitrary id
* *
* @param {String} pageId * @param {String} pageId
*/ */
CHK_TOP.showPage = function(pageId) { TOP.showPage = function (pageId) {
//get data //get data
if (pageId == CHK_CONSTANT.PAGE_NAME.OPERATION_LIST) { if (pageId == CONSTANT.PAGE_NAME.OPERATION_LIST) {
CHK_OL.init(); OL.init();
} else if (pageId == CHK_CONSTANT.PAGE_NAME.DASHBOARD) { } else if (pageId == CONSTANT.PAGE_NAME.DASHBOARD) {
CHK_Dashboard.init(); CHK_Dashboard.init();
} }
//show page //show page
const pages = document.getElementsByClassName("page-content"); const pages = document.getElementsByClassName('page-content');
for (let i = 0; i < pages.length; i++) { for (let i = 0; i < pages.length; i++) {
if (pages[i].id == pageId) { if (pages[i].id == pageId) {
pages[i].style.display = "block"; pages[i].style.display = 'block';
} else { } else {
pages[i].style.display = "none"; pages[i].style.display = 'none';
} }
} }
} };
\ 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