Skip to content

C
check
Commit cffc39c9 by NGUYEN HOANG SON
Options

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

# Conflicts:
#	abweb/html/sendMessage.html
parents c8e04fea 435de41a
Showing with 587 additions and 410 deletions
abweb/common/css/app.css
...@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{ ...@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{
} }
.select-card-list .arrow-icon { .select-card-list .arrow-icon {
background-image: url("../../img/icon_arrow_down.svg"); background-image: url("../img/icon_arrow_down.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 14px; width: 14px;
...@@ -20689,7 +20689,7 @@ button { ...@@ -20689,7 +20689,7 @@ button {
.type-icon .report:before{ .type-icon .report:before{
content: ''; content: '';
background-image: url("../../img/type_icon_report.svg"); background-image: url("../img/type_icon_report.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20699,7 +20699,7 @@ button { ...@@ -20699,7 +20699,7 @@ button {
} }
.type-icon .questionary:before{ .type-icon .questionary:before{
content: ''; content: '';
background-image: url("../../img/type_icon_questionary.svg"); background-image: url("../img/type_icon_questionary.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20709,7 +20709,7 @@ button { ...@@ -20709,7 +20709,7 @@ button {
} }
.type-icon .inspection:before{ .type-icon .inspection:before{
content: ''; content: '';
background-image: url("../../img/type_icon_inspection.svg"); background-image: url("../img/type_icon_inspection.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20719,7 +20719,7 @@ button { ...@@ -20719,7 +20719,7 @@ button {
} }
.type-icon .proccess:before{ .type-icon .proccess:before{
content: ''; content: '';
background-image: url("../../img/type_icon_proccess.svg"); background-image: url("../img/type_icon_proccess.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
......
abweb/common/js/app.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
abweb/common/js/app.js.LICENSE.txt 0 → 100644
/*!
* Bootstrap v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
/*!
* Sizzle CSS Selector Engine v2.3.5
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2020-03-14
*/
/*!
* jQuery JavaScript Library v3.5.1
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2020-05-04T22:49Z
*/
/*!@preserve
* Tempus Dominus Bootstrap4 v5.39.0 (https://tempusdominus.github.io/bootstrap-4/)
* Copyright 2016-2020 Jonathan Peterson and contributors
* Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
*/
/**!
* @fileOverview Kickass library to create and place poppers near their reference elements.
* @version 1.16.1
* @license
* Copyright (c) 2016 Federico Zivolo and contributors
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
//! moment.js
//! moment.js locale configuration
abweb/common/js/constant.js
...@@ -23,6 +23,25 @@ CONSTANT.PAGE_NAME = { ...@@ -23,6 +23,25 @@ CONSTANT.PAGE_NAME = {
LOGIN: './login.html', LOGIN: './login.html',
}; };
CONSTANT.URL_TREE_NAME = {
OPERATION_LIST: 'index.html',
DASHBOARD: 'dashboard.html',
REPORT_FORM: 'reportForm.html',
REPORT_LIST: 'reportList.html',
MESSAGE_DETAIL: 'pushMessageDetail.html',
MESSAGE_LIST: 'pushMessageList.html',
SEND_MESSAGE: 'sendMessage.html',
SETTING: 'accountSetting.html',
PICKUP: 'pickup.html',
};
CONSTANT.URL_TREE_PASS = {
1: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
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],
};
CONSTANT.PAGE_TAB = { CONSTANT.PAGE_TAB = {
DASHBOARD: 'dashboard', DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList', OPERATION_LIST: 'operationList',
...@@ -35,6 +54,13 @@ CONSTANT.REPORT_TYPE = { ...@@ -35,6 +54,13 @@ CONSTANT.REPORT_TYPE = {
WORKFLOW: '3', WORKFLOW: '3',
}; };
CONSTANT.REPORT_TYPE_INT = {
REPORT: 0,
ROUTINE: 1,
ANSWER: 2,
WORKFLOW: 3,
};
CONSTANT.ADD_REPORT_FLG = { CONSTANT.ADD_REPORT_FLG = {
UNABLE: '0', UNABLE: '0',
ABLE: '1', ABLE: '1',
...@@ -66,7 +92,6 @@ CONSTANT.URL = { ...@@ -66,7 +92,6 @@ CONSTANT.URL = {
PUSH_MESSAGE_LIST: 'pushMessageList/', PUSH_MESSAGE_LIST: 'pushMessageList/',
SEND_PUSH_MESSAGE: 'sendPushMessage/', SEND_PUSH_MESSAGE: 'sendPushMessage/',
IS_QUICK_REPORT: 'getOperationData/isQuickReport', IS_QUICK_REPORT: 'getOperationData/isQuickReport',
}, },
HTML: { HTML: {
BASE: 'html/', BASE: 'html/',
...@@ -136,35 +161,3 @@ CONSTANT.KEYS = { ...@@ -136,35 +161,3 @@ CONSTANT.KEYS = {
// Local: // Local:
JumpQueue: 'JumpQueue', JumpQueue: 'JumpQueue',
}; };
CONSTANT.MSG_MAP = {
all: { ja: '全て', ko: '전체', en: 'All' },
dateError: { ja: '開始日は終了日の前に設定してください。', ko: '잘못된 검색일입니다.', en: 'Please enter correct search date.' },
operationListTitle: { ja: 'トップページ｜A Book Check', ko: '톱 페이지｜A Book Check', en: 'Top Page｜A Book Check' },
buttonCategory: { ja: 'カテゴリー', ko: '카테고리', en: 'Category' },
buttonRefresh: { ja: '更新', ko: '갱신', en: 'Refresh' },
buttonBack: { ja: '戻る', ko: 'Back', en: 'Back' },
placeholderOperationName: { ja: '作業名', ko: '작업명', en: 'Working Name' },
labelPeriod: { ja: '期間', ko: '기간', en: 'Period' },
labelStartDate: { ja: '開始日', ko: '시작일', en: 'Start date' },
labelEndDate: { ja: '終了日', ko: '종료일', en: 'End date' },
placeholderSelect: { ja: '選択', ko: '선택', en: 'Choice' },
labelSort: { ja: '並び替え', ko: '정렬', en: 'Sort' },
labelSortName: { ja: '作業名順', ko: '작업명순', en: 'By working name' },
labelSortNew: { ja: '作業期間が新しい順', ko: '작업기간이 최신순', en: 'By newest period' },
labelSortOld: { ja: '作業期間が古い順', ko: '작업기간이 오래된순', en: 'By oldest period' },
labelSortOpen: { ja: '閲覧日が新しい順', ko: '열람순', en: 'By newest viewing date' },
labelReset: { ja: 'クリア', ko: '클리어', en: 'Clear' },
headerItemName: { ja: '作業名', ko: '작업명', en: 'Working Name' },
headerStartDate: { ja: '開始日', ko: '시작일', en: 'Start date' },
headerEndDate: { ja: '終了日', ko: '종료일', en: 'End date' },
buttonHome: { ja: 'ホーム', ko: '홈', en: 'Home' },
buttonSetting: { ja: '設定', ko: '설정', en: 'Setting' },
buttonOperationList: { ja: '作業一覧', ko: '작업일람', en: 'Operations List' },
operationListHeaderTitle: { ja: '作業一覧', ko: '작업일람', en: 'Operations List' },
buttonDashboard: { ja: 'ダッシュボード', ko: '대시보드', en: 'Dashboard' },
buttonDashboardSetting: { ja: '設定', ko: '설정', en: 'Setting' },
Processing_w_dot: { ja: '処理中...', ko: '처리중', en: 'Processing...' },
errorCommunicationFailed: { ja: '通信エラーが発生しました', ko: '통신 오류가 발생했습니다', en: 'A communication error has occurred' },
errorOccurred: { ja: 'エラーが発生しました', ko: '오류가 발생했습니다', en: 'Error Occurred' },
};
abweb/common/js/event.js
/**
* js for event behavior
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
$(function () { $(function () {
hide_del_btn(); hide_del_btn();
}); });
...@@ -138,18 +144,3 @@ $('.view-menu .view-block-btn').on('click', function () { ...@@ -138,18 +144,3 @@ $('.view-menu .view-block-btn').on('click', function () {
$('.view-content').removeClass('view-list'); $('.view-content').removeClass('view-list');
$('.view-content').addClass('view-block'); $('.view-content').addClass('view-block');
}); });
/** loading */
$(function () {
function e() {
setTimeout(function () {
$.LoadingOverlay('hide');
}, 2000);
}
$('.search-form-btn').on('click', function () {
$.LoadingOverlay('show', {
image: 'img/loading.gif',
});
e();
});
});
abweb/common/js/header.js
...@@ -5,55 +5,172 @@ ...@@ -5,55 +5,172 @@
* @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 HEADER = {}; var HEADER = {};
/** Direct home page setting */ /**
HEADER.goToHomePage = function (pageId) { * 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) { DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1) if (settings.dashboardHome == 1) {
{
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
HEADER.goDashboard(); HEADER.goDashboard();
} } else {
else
{
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.goOperationList(); 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 * Go page of operationList
*/ */
HEADER.goOperationList = function () { HEADER.goOperationList = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.OPERATION_LIST;
OL.init(); OL.init();
}; };
/** /**
* Go page of dashboard * Go page of dashboard
*/ */
HEADER.goDashboard = function () { HEADER.goDashboard = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
COMMON.avwScreenMove("dashboard.html"); COMMON.avwScreenMove('dashboard.html');
}; };
/** /**
* Initialize with any navigation * Initialize with any navigation
* *
* @param {String} bottomNav * @param {String} bottomNav
*/ */
HEADER.activeInitBottomNav = function (bottomNav) { HEADER.activeInitBottomNav = function (bottomNav) {
HEADER.inactiveAllBottomNav(); HEADER.inactiveAllBottomNav();
HEADER.activeBottomNav(bottomNav); HEADER.activeBottomNav(bottomNav);
}; };
/** /**
* change inactive all footer bottom * change inactive all footer bottom
*/ */
HEADER.inactiveAllBottomNav = function () { HEADER.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');
...@@ -62,15 +179,14 @@ ...@@ -62,15 +179,14 @@
img.src = img.getAttribute('data-inactive-src'); img.src = img.getAttribute('data-inactive-src');
} }
} }
}; };
/**
/**
* Change specific footer bottom to active. * Change specific footer bottom to active.
* *
* @param {String} bottomNavId * @param {String} bottomNavId
*/ */
HEADER.activeBottomNav = function (bottomNavId) { HEADER.activeBottomNav = function (bottomNavId) {
let elm = $('#' + bottomNavId); let elm = $('#' + bottomNavId);
if (typeof elm !== 'object') { if (typeof elm !== 'object') {
console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId); console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId);
...@@ -82,4 +198,4 @@ ...@@ -82,4 +198,4 @@
if (img && img.getAttribute('data-src')) { if (img && img.getAttribute('data-src')) {
img.src = img.getAttribute('data-src'); img.src = img.getAttribute('data-src');
} }
}; };
abweb/common/js/i18n.js
/** /**
* ABook Viewer for WEB * ABook Viewer for WEB
* 国際化（言語切替）対応共通処理 * Common processing for internationalization (language switching)
* *
* 言語リソースファイルは、指定する言語に合わせて以下のファイルを修正する * For language resource files, modify the following files according to the language you specify
* - 日本語：　lang-ja.json * - ja：　lang-ja.json
* - 韓国語：　lang-ko.json * - ko：　lang-ko.json
* - 英語　：　lang-en.json * - en　：　lang-en.json
* *
* Copyright (C) Agentec Co, Ltd. All rights reserved. * Copyright (C) Agentec Co, Ltd. All rights reserved.
*/ */
//グローバルの名前空間用のオブジェクトを用意する //Prepare objects for the global namespace
var I18N = {}; var I18N = {};
/** /**
* 定数：言語ファイル配置場所 * Constant: Language file location
*/ */
I18N.avwsys_location = ''; I18N.avwsys_location = '';
I18N.avwsys_dir = ''; I18N.avwsys_dir = '';
I18N.avwsys_storagekey = ''; I18N.avwsys_storagekey = '';
I18N.avwsys_currLang = ''; I18N.avwsys_currLang = '';
/* 言語の初期化 */ /* Language initialization */
$(function () { $(function () {
I18N.initi18n(); I18N.initi18n();
}); });
/** 言語リソース設定初期化 */ /** Initialization of language resource settings */
I18N.initi18n = function () { I18N.initi18n = function () {
I18N.avwsys_location = '/common/json/lang'; I18N.avwsys_location = '/common/json/lang';
I18N.avwsys_dir = '/abweb'; I18N.avwsys_dir = '/abweb';
I18N.avwsys_storagekey = 'AVWUS_Lang'; I18N.avwsys_storagekey = 'AVWUS_Lang';
I18N.avwsys_currLang = 'AVW_CurrLang'; I18N.avwsys_currLang = 'AVW_CurrLang';
// ログイン画面/直接アクセス対策 // Login screen/direct access measures
var location = window.location.toString().toLowerCase(); var location = window.location.toString().toLowerCase();
if (location.indexOf(I18N.avwsys_dir) < 0) { if (location.indexOf(I18N.avwsys_dir) < 0) {
// I18N.avwsys_dirディレクトリ配下ではない場合は、I18N.avwsys_dirディレクトリをつける // If not under I18N.avwsys_dir directory, add I18N.avwsys_dir directory
I18N.avwsys_location = '..' + I18N.avwsys_dir + I18N.avwsys_location; I18N.avwsys_location = '..' + I18N.avwsys_dir + I18N.avwsys_location;
} else { } else {
// I18N.avwsys_dirディレクトリ配下の場合は、相対パスに変換 // If under I18N.avwsys_dir directory, convert to relative path
I18N.avwsys_location = '..' + I18N.avwsys_location; I18N.avwsys_location = '..' + I18N.avwsys_location;
} }
...@@ -51,15 +51,15 @@ I18N.initi18n = function () { ...@@ -51,15 +51,15 @@ I18N.initi18n = function () {
lang = I18N.getNavigatorLanguage(); lang = I18N.getNavigatorLanguage();
} }
} }
// 言語ファイルを初期化する // Initialize language files
I18N.loadLanguage(lang); I18N.loadLanguage(lang);
}; };
/* ブラウザの言語設定を取得する */ /* Retrieve browser language settings */
I18N.getNavigatorLanguage = function () { I18N.getNavigatorLanguage = function () {
var lang = navigator.browserLanguage || navigator.language || navigator.userLanguage; var lang = navigator.browserLanguage || navigator.language || navigator.userLanguage;
/* 対応言語 */ /* Languages Supported */
var languages = ['ja', 'ko', 'en']; // 対応言語を増やす場合はここを変更する var languages = ['ja', 'ko', 'en']; // Change here if you want to add more supported languages
if (lang.match(/ja|ko|en/g)) { if (lang.match(/ja|ko|en/g)) {
for (var i = 0; i < languages.length; i++) { for (var i = 0; i < languages.length; i++) {
var index = lang.indexOf(languages[i]); var index = lang.indexOf(languages[i]);
...@@ -69,31 +69,34 @@ I18N.getNavigatorLanguage = function () { ...@@ -69,31 +69,34 @@ I18N.getNavigatorLanguage = function () {
} }
} }
} else { } else {
lang = 'en'; // 対応言語が無ければ英語をデフォルトとする lang = 'en'; // If there is no supported language, English is the default.
} }
return lang; return lang;
}; };
/* 言語リソースファイル読み込み */ /**
* Language resource file loading
* @param {*} lang
*/
I18N.loadLanguage = function (lang) { I18N.loadLanguage = function (lang) {
// 引数から言語ファイルを選択 // Select language file from arguments
var langfile = 'lang-' + lang + '.json'; var langfile = 'lang-' + lang + '.json';
// 言語ファイルを読み込む // Read the language file
$.ajax({ $.ajax({
url: I18N.avwsys_location + '/' + langfile, url: I18N.avwsys_location + '/' + langfile,
async: false, async: false,
dataType: 'json', dataType: 'json',
cache: false, cache: false,
success: function (data) { success: function (data) {
// lang属性の書換え // Rewriting the lang attribute
document.documentElement.lang = lang; document.documentElement.lang = lang;
// html の言語データを書換える // Rewrite html language data
var jsonLangData = data; var jsonLangData = data;
I18N.replaceText(jsonLangData); I18N.replaceText(jsonLangData);
// 言語設定、言語データをストレージにキャッシュしておく // Cache language settings and language data in storage
I18N.storeCurrentLanguage(lang, jsonLangData); I18N.storeCurrentLanguage(lang, jsonLangData);
}, },
error: function (xhr, txtStatus, errorThrown) { error: function (xhr, txtStatus, errorThrown) {
...@@ -104,7 +107,10 @@ I18N.loadLanguage = function (lang) { ...@@ -104,7 +107,10 @@ I18N.loadLanguage = function (lang) {
}); });
}; };
/* ページ内のテキストをすべて言語に合わせて置換する */ /**
* Replace all text on the page with the language
* @param {*} jsonLangData
*/
I18N.replaceText = function (jsonLangData) { I18N.replaceText = function (jsonLangData) {
var itemCount = $('.lang').length; var itemCount = $('.lang').length;
if (itemCount > 0) { if (itemCount > 0) {
...@@ -137,7 +143,7 @@ I18N.replaceText = function (jsonLangData) { ...@@ -137,7 +143,7 @@ I18N.replaceText = function (jsonLangData) {
} }
}; };
/* 現在設定されている言語でHTMLテキストを置き換える */ /* Replace HTML text with the currently set language */
I18N.i18nReplaceText = function () { I18N.i18nReplaceText = function () {
var storage = window.sessionStorage; var storage = window.sessionStorage;
if (storage) { if (storage) {
...@@ -149,7 +155,11 @@ I18N.i18nReplaceText = function () { ...@@ -149,7 +155,11 @@ I18N.i18nReplaceText = function () {
} }
}; };
/* キーから文字列を取得 */ /**
* Get string from key
* @param {*} key
* @returns
*/
I18N.i18nText = function (key) { I18N.i18nText = function (key) {
var storage = window.sessionStorage; var storage = window.sessionStorage;
if (storage) { if (storage) {
...@@ -162,7 +172,12 @@ I18N.i18nText = function (key) { ...@@ -162,7 +172,12 @@ I18N.i18nText = function (key) {
return 'undefined'; return 'undefined';
}; };
/* 言語データのキー値から文字列を取得 */ /**
* Obtain strings from key values of language data
* @param {*} jsonLangData
* @param {*} key
* @returns
*/
I18N.getLangText = function (jsonLangData, key) { I18N.getLangText = function (jsonLangData, key) {
if (jsonLangData) { if (jsonLangData) {
var text = jsonLangData[key]; var text = jsonLangData[key];
...@@ -171,19 +186,26 @@ I18N.getLangText = function (jsonLangData, key) { ...@@ -171,19 +186,26 @@ I18N.getLangText = function (jsonLangData, key) {
return 'undefined.'; return 'undefined.';
}; };
/* 言語データの切り替え */ /**
* Switching Language Data
* @param {*} lang
*/
I18N.changeLanguage = function (lang) { I18N.changeLanguage = function (lang) {
// 言語の切替を行った場合のみ選択言語をストアする // Store the selected language only when switching languages
var storage = window.localStorage; var storage = window.localStorage;
if (storage) { if (storage) {
storage.setItem(I18N.avwsys_storagekey, lang); storage.setItem(I18N.avwsys_storagekey, lang);
} }
// 言語ファイルを読み込み、テキスト文字列を変換する // Reads language files and converts text strings
I18N.loadLanguage(lang); I18N.loadLanguage(lang);
}; };
/* 設定言語の保存 */ /**
* Save language settings
* @param {*} lang
* @param {*} langData
*/
I18N.storeCurrentLanguage = function (lang, langData) { I18N.storeCurrentLanguage = function (lang, langData) {
var ss = window.sessionStorage; var ss = window.sessionStorage;
if (ss) { if (ss) {
...@@ -193,7 +215,7 @@ I18N.storeCurrentLanguage = function (lang, langData) { ...@@ -193,7 +215,7 @@ I18N.storeCurrentLanguage = function (lang, langData) {
ss.setItem(I18N.avwsys_currLang, lang); ss.setItem(I18N.avwsys_currLang, lang);
} }
}; };
/* 設定言語の取得 */ /* Retrieving the setting language */
I18N.getCurrentLanguage = function () { I18N.getCurrentLanguage = function () {
var lang; var lang;
var storage = window.sessionStorage; var storage = window.sessionStorage;
......
abweb/common/js/validation.js
/* /**
* String utilities [ end ] * String utilities [ end ]
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
// ============================================================================================= // =============================================================================================
// Utils for string, date, number [ end ] // Utils for string, date, number [ end ]
// ============================================================================================= // =============================================================================================
var ValidationUtil = { var ValidationUtil = {
// Required Text // Required Text
CheckRequiredForText : function(value) { CheckRequiredForText: function (value) {
if (value == null || value == '') { if (value == null || value == '') {
return false; return false;
} }
...@@ -17,13 +17,12 @@ var ValidationUtil = { ...@@ -17,13 +17,12 @@ var ValidationUtil = {
}, },
// get byte count // get byte count
GetByteCount : function(value) { GetByteCount: function (value) {
var escapedStr = encodeURI(value); var escapedStr = encodeURI(value);
if (escapedStr.indexOf("%") != -1) { if (escapedStr.indexOf('%') != -1) {
var count = escapedStr.split("%").length - 1; var count = escapedStr.split('%').length - 1;
if (count == 0) if (count == 0) count++; // perverse case; can't happen with real UTF-8
count++; // perverse case; can't happen with real UTF-8 var tmp = escapedStr.length - count * 3;
var tmp = escapedStr.length - (count * 3);
count = count + tmp; count = count + tmp;
} else { } else {
count = escapedStr.length; count = escapedStr.length;
...@@ -32,65 +31,64 @@ var ValidationUtil = { ...@@ -32,65 +31,64 @@ var ValidationUtil = {
}, },
// check text min length // check text min length
CheckMinLengthForByte : function(value, len) { CheckMinLengthForByte: function (value, len) {
if (this.GetByteCount(value) < len) if (this.GetByteCount(value) < len) return false;
return false;
return true; return true;
}, },
// check text max length // check text max length
CheckMaxLengthForByte : function(value, len) { CheckMaxLengthForByte: function (value, len) {
if (this.GetByteCount(value) > len) return false;
if (this.GetByteCount(value) > len)
return false;
return true; return true;
}, },
// check if the text is a number // check if the text is a number
IsNumber : function(value) { IsNumber: function (value) {
var reg = new RegExp("^[0-9]+$"); var reg = new RegExp('^[0-9]+$');
return reg.test(value); return reg.test(value);
}, },
// check if the text is a alphabet // check if the text is a alphabet
IsAlphabet : function(value) { IsAlphabet: function (value) {
var reg = new RegExp("^[a-zA-Z]+$"); var reg = new RegExp('^[a-zA-Z]+$');
return reg.test(value); return reg.test(value);
}, },
// check if the text is a symbol // check if the text is a symbol
IsSymbol : function(value) { IsSymbol: function (value) {
var reg = new RegExp( var reg = new RegExp(
"\u005b\u005e\u0027\u0060\u0027\u007e\u0027\u0021\u0027\u0040\u0027\u0023\u0027\u0024\u0027\u0025\u0027\u005e\u0027\u0026\u0027\u002a\u0027\u0028\u0027\u0029\u0027\u005f\u0027\u002b\u0027\u003d\u0027\u007b\u0027\u007d\u0027\u007c\u0027\u003a\u0027\u0022\u0027\u003b\u0027\u0027\u0027\u003c\u0027\u003e\u0027\u003f\u0027\u002f\u0027\u002e\u0027\u002c\u005c\u002d\u005b\u005c\u005d\u005c\u005c\u005d"); '\u005b\u005e\u0027\u0060\u0027\u007e\u0027\u0021\u0027\u0040\u0027\u0023\u0027\u0024\u0027\u0025\u0027\u005e\u0027\u0026\u0027\u002a\u0027\u0028\u0027\u0029\u0027\u005f\u0027\u002b\u0027\u003d\u0027\u007b\u0027\u007d\u0027\u007c\u0027\u003a\u0027\u0022\u0027\u003b\u0027\u0027\u0027\u003c\u0027\u003e\u0027\u003f\u0027\u002f\u0027\u002e\u0027\u002c\u005c\u002d\u005b\u005c\u005d\u005c\u005c\u005d',
);
return !reg.test(value); return !reg.test(value);
}, },
// check if the text is a emailAddress // check if the text is a emailAddress
CheckEmailValid : function(value) { CheckEmailValid: function (value) {
// Check if string is a valid email address // Check if string is a valid email address
var reg = new RegExp("^[0-9a-zA-Z]+@[0-9a-zA-Z]+[\\.]{1}[0-9a-zA-Z]+[\\.]?[0-9a-zA-Z]+$"); var reg = new RegExp('^[0-9a-zA-Z]+@[0-9a-zA-Z]+[\\.]{1}[0-9a-zA-Z]+[\\.]?[0-9a-zA-Z]+$');
return reg.test(value); return reg.test(value);
}, },
// Password // Password
CheckPasswordValid : function(value) { CheckPasswordValid: function (value) {
// Check if string is a valid email address // Check if string is a valid email address
var reg = new RegExp("^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[#+-\\./:_]).{1,47}$"); var reg = new RegExp('^(?=.*d)(?=.*[a-z])(?=.*[A-Z])(?=.*[#+-\\./:_]).{1,47}$');
return reg.test(value); return reg.test(value);
}, },
// Alphabet + Nunber + Symbol // Alphabet + Nunber + Symbol
IsAlphabetOrNumberOrSymbol : function(value) { IsAlphabetOrNumberOrSymbol: function (value) {
// Check if string is alphabet or number or symbol // Check if string is alphabet or number or symbol
var reg = new RegExp( var reg = new RegExp(
"\u005b\u005e\u0061\u002d\u007a\u0041\u002d\u005a\u0030\u002d\u0039\u0027\u0060\u0027\u007e\u0027\u0021\u0027\u0040\u0027\u0023\u0027\u0024\u0027\u0025\u0027\u005e\u0027\u0026\u0027\u002a\u0027\u0028\u0027\u0029\u0027\u005f\u0027\u002b\u0027\u003d\u0027\u007b\u0027\u007d\u0027\u007c\u0027\u003a\u0027\u0022\u0027\u003b\u0027\u0027\u0027\u003c\u0027\u003e\u0027\u003f\u0027\u002f\u0027\u002e\u0027\u002c\u005c\u002d\u005b\u005c\u005d\u005c\u005c\u005d"); '\u005b\u005e\u0061\u002d\u007a\u0041\u002d\u005a\u0030\u002d\u0039\u0027\u0060\u0027\u007e\u0027\u0021\u0027\u0040\u0027\u0023\u0027\u0024\u0027\u0025\u0027\u005e\u0027\u0026\u0027\u002a\u0027\u0028\u0027\u0029\u0027\u005f\u0027\u002b\u0027\u003d\u0027\u007b\u0027\u007d\u0027\u007c\u0027\u003a\u0027\u0022\u0027\u003b\u0027\u0027\u0027\u003c\u0027\u003e\u0027\u003f\u0027\u002f\u0027\u002e\u0027\u002c\u005c\u002d\u005b\u005c\u005d\u005c\u005c\u005d',
);
return !reg.test(value); return !reg.test(value);
}, },
// Get the total of types in array // Get the total of types in array
CheckNumberOfTypeInString : function(value) { CheckNumberOfTypeInString: function (value) {
var list = new Array(); var list = new Array();
var c; var c;
for ( var i = 0; i < value.length; i++) { for (var i = 0; i < value.length; i++) {
c = value[i]; c = value[i];
for ( var j = i + 1; j < value.length; j++) { for (var j = i + 1; j < value.length; j++) {
if (value[j] == c) { if (value[j] == c) {
value = value.slice(0, j) + value.slice(j + 1, value.len); value = value.slice(0, j) + value.slice(j + 1, value.len);
j = j - 1; j = j - 1;
...@@ -99,31 +97,30 @@ var ValidationUtil = { ...@@ -99,31 +97,30 @@ var ValidationUtil = {
list[i] = c; list[i] = c;
} }
var count = list.length; var count = list.length;
return count return count;
}, },
// Special character: * // Special character: *
IsCharacterSpecial : function(value) { IsCharacterSpecial: function (value) {
for ( var i = 0; i < value.length; i++) { for (var i = 0; i < value.length; i++) {
if (value[i] == '*') if (value[i] == '*') return true;
return true;
} }
return false; return false;
}, },
// Symbol check for password // Symbol check for password
IsPasswordSymbol : function(value) { IsPasswordSymbol: function (value) {
var reg = new RegExp("\u005b\u005e\u0027\u0023\u0027\u002b\u005c\u002d\u0027\u002e\u0027\u002f\u0027\u003a\u0027\u005f\u005d"); var reg = new RegExp('\u005b\u005e\u0027\u0023\u0027\u002b\u005c\u002d\u0027\u002e\u0027\u002f\u0027\u003a\u0027\u005f\u005d');
return !reg.test(value); return !reg.test(value);
}, },
// text check for password(Alphabet Or Number Or Symbol) // text check for password(Alphabet Or Number Or Symbol)
IsPasswordAlphabetOrNumberOrSymbol : function(value) { IsPasswordAlphabetOrNumberOrSymbol: function (value) {
var reg = new RegExp("\u005b\u005e\u0061\u002d\u007a\u0041\u002d\u005a\u0030\u002d\u0039\u0027\u0023\u0027\u002b\u005c\u002d\u0027\u002e\u0027\u002f\u0027\u003a\u0027\u005f\u005d"); var reg = new RegExp('\u005b\u005e\u0061\u002d\u007a\u0041\u002d\u005a\u0030\u002d\u0039\u0027\u0023\u0027\u002b\u005c\u002d\u0027\u002e\u0027\u002f\u0027\u003a\u0027\u005f\u005d');
return !reg.test(value); return !reg.test(value);
}, },
// Check at consecutive characters // Check at consecutive characters
HasSeqChar : function(str, num) { HasSeqChar: function (str, num) {
var count = 0; var count = 0;
var prev = 0; var prev = 0;
...@@ -134,8 +131,7 @@ var ValidationUtil = { ...@@ -134,8 +131,7 @@ var ValidationUtil = {
if (count == num - 1) { if (count == num - 1) {
return true; return true;
} }
} } else {
else {
count = 0; count = 0;
} }
prev = c; prev = c;
...@@ -145,7 +141,7 @@ var ValidationUtil = { ...@@ -145,7 +141,7 @@ var ValidationUtil = {
}, },
// Check same characters in text // Check same characters in text
ContainSameSeqChar : function(str1, str2, num) { ContainSameSeqChar: function (str1, str2, num) {
if (str2.length < num || str1.length < num) { if (str2.length < num || str1.length < num) {
return false; return false;
} }
...@@ -157,5 +153,5 @@ var ValidationUtil = { ...@@ -157,5 +153,5 @@ var ValidationUtil = {
} }
} }
return false; return false;
} },
}; };
abweb/common/json/lang/lang-en.json
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
"dashboardSettings":"Dashboard Settings", "dashboardSettings":"Dashboard Settings",
"pickup":"Pick up", "pickup":"Pick up",
"communication":"Communication", "communication":"Communication",
"workList":"Work list", "workList":"Operation list",
"profile":"Profile", "profile":"Profile",
"account_setting":"Account setting", "account_setting":"Account setting",
"newRegistrationTitle":"New Registration", "newRegistrationTitle":"New Registration",
......
abweb/html/accountSetting.html
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></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/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/validation.js"></script> <script type="text/javascript" src="../common/js/validation.js"></script>
<script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script>
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
...@@ -97,9 +97,9 @@ ...@@ -97,9 +97,9 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
abweb/html/dashboard.html
...@@ -20,12 +20,11 @@ ...@@ -20,12 +20,11 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.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/header/header.js"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
...@@ -38,6 +37,7 @@ ...@@ -38,6 +37,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- dashboard --> <!-- dashboard -->
...@@ -66,6 +66,8 @@ ...@@ -66,6 +66,8 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/index.html
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.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/operationList/operationList.js?__UPDATEID__"></script> <script src="../js/operationList/operationList.js?__UPDATEID__"></script>
...@@ -30,11 +29,11 @@ ...@@ -30,11 +29,11 @@
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script> <script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="../js/template/template.js?__UPDATEID__"></script> <script src="../js/template/template.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script> <script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__" defer></script> <script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- task list --> <!-- task list -->
...@@ -134,17 +133,20 @@ ...@@ -134,17 +133,20 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<!--アラート--> <!--alert-->
<div class="alert-overlay d-none"></div> <div class="alert-overlay d-none"></div>
<div class="alert-area d-none"> <div class="alert-area d-none">
<i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i> <i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i>
<div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div> <div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div>
</div> </div>
<!--ローディング--> <!--loading-->
<div id="check_loading" style="display:none; position: relative; overflow:hidden;"> <div id="check_loading" style="display:none; position: relative; overflow:hidden;">
<p id="checkLoadingMessage"></p> <p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='######' /></div> <div id="checkLoadingImage"><img src='######' /></div>
</div> </div>
</div>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
</html> </html>
abweb/html/pdfPrint.html
...@@ -20,12 +20,10 @@ ...@@ -20,12 +20,10 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../common/js/header.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="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.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"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
...@@ -35,7 +33,7 @@ ...@@ -35,7 +33,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
...@@ -56,13 +54,13 @@ ...@@ -56,13 +54,13 @@
</div> </div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ --> <!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrint"></div> <div class="container-wrap mb-5" id="pdfPrint" ></div>
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/pickup.html
...@@ -27,13 +27,10 @@ ...@@ -27,13 +27,10 @@
<script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__" defer></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="../common/js/event.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="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"></script>
<script type="text/javascript"> <script type="text/javascript">
...@@ -43,7 +40,8 @@ ...@@ -43,7 +40,8 @@
</script> </script>
</head> </head>
<body > <body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- pickup --> <!-- pickup -->
<main> <main>
...@@ -140,6 +138,9 @@ ...@@ -140,6 +138,9 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/pushMessageDetail.html
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
<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-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script> <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 type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.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="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script> <script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script>
<script type="text/javascript"> <script type="text/javascript">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- message detail --> <!-- message detail -->
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
</main> </main>
<script type="text/javascript" src="../common/js/app.js"></script> <script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/pushMessageList.html
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
<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-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script> <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 type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/header.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="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
...@@ -33,8 +34,7 @@ ...@@ -33,8 +34,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- message list --> <!-- message list -->
<main> <main>
...@@ -54,5 +54,6 @@ ...@@ -54,5 +54,6 @@
</main> </main>
<script type="text/javascript" src="../common/js/app.js"></script> <script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/reportForm.html
...@@ -20,13 +20,15 @@ ...@@ -20,13 +20,15 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></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/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.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/template/template.js"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head> </head>
<body onload="RF.init();"> <body onload="RF.init();">
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
...@@ -59,8 +61,8 @@ ...@@ -59,8 +61,8 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/reportList.html
...@@ -20,13 +20,11 @@ ...@@ -20,13 +20,11 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></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/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../common/js/header.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="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.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 type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
RL.init(); RL.init();
...@@ -35,8 +33,8 @@ ...@@ -35,8 +33,8 @@
</script> </script>
</head> </head>
<body > <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
...@@ -46,8 +44,9 @@ ...@@ -46,8 +44,9 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
abweb/html/sendMessage.html
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script> <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 type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/validation.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/validation.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/operationSelect/operationSelect.js"></script> <script type="text/javascript" src="../js/operationSelect/operationSelect.js"></script>
<script type="text/javascript" src="../js/notificationContent/notificationContent.js"></script> <script type="text/javascript" src="../js/notificationContent/notificationContent.js"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/header/header.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="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/sendMessage/sendMessage.js"></script> <script type="text/javascript" src="../js/sendMessage/sendMessage.js"></script>
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- send message --> <!-- send message -->
<main> <main>
...@@ -92,6 +93,7 @@ ...@@ -92,6 +93,7 @@
<div id="includeTemplateModal"></div> <div id="includeTemplateModal"></div>
<script type="text/javascript" src="../common/js/app.js"></script> <script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/js/dashboard/dashboard.js
...@@ -15,8 +15,6 @@ DASHBOARD.pickupItems = [ ...@@ -15,8 +15,6 @@ DASHBOARD.pickupItems = [
DASHBOARD.communicationItems = [ DASHBOARD.communicationItems = [
{ id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'messageListTitle' }, { 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: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessageTitle' },
{ id: 'distanceSupport', href: 'javascript:DASHBOARD.goDistanceSupport();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_remote.svg' }, msg: 'distanceSupportTitle' },
{ id: 'chat', href: 'javascript:DASHBOARD.goChat();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_chat.svg' }, msg: 'chatTitle' },
]; ];
/** Default dashboard setting data */ /** Default dashboard setting data */
...@@ -31,6 +29,7 @@ DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientDat ...@@ -31,6 +29,7 @@ DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientDat
/** /**
* Call api get data * Call api get data
* @param callback
*/ */
DASHBOARD.getDashboardData = function (callback) { DASHBOARD.getDashboardData = function (callback) {
let param = { let param = {
...@@ -82,7 +81,11 @@ DASHBOARD.initCommunications = function () { ...@@ -82,7 +81,11 @@ DASHBOARD.initCommunications = function () {
}); });
}; };
/** Initialization dashboard items html */ /**
* Initialization dashboard items html
* @param {*} item
* @returns
*/
DASHBOARD.initHtmlItem = function (item) { DASHBOARD.initHtmlItem = function (item) {
let countText = '' + item.count; let countText = '' + item.count;
if (item.count >= 100) { if (item.count >= 100) {
...@@ -134,6 +137,7 @@ DASHBOARD.init = function () { ...@@ -134,6 +137,7 @@ DASHBOARD.init = function () {
DASHBOARD.initCommunications(); DASHBOARD.initCommunications();
}); });
}); });
COMMON.closeLoading();
}; };
/** load common data */ /** load common data */
DASHBOARD.loadCommon = function () { DASHBOARD.loadCommon = function () {
...@@ -143,7 +147,11 @@ DASHBOARD.loadCommon = function () { ...@@ -143,7 +147,11 @@ DASHBOARD.loadCommon = function () {
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'dashboard', null, DASHBOARD.loadMainTitleCallback); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'dashboard', null, DASHBOARD.loadMainTitleCallback);
}; };
/** Update pickup config from setting dashboard data */ /**
* Update pickup config from setting dashboard data
* @param {*} settings
* @param {*} dataDashboard
*/
DASHBOARD.updateDataPickups = function (settings, dataDashboard) { DASHBOARD.updateDataPickups = function (settings, dataDashboard) {
DASHBOARD.pickupItems.forEach(function (item) { DASHBOARD.pickupItems.forEach(function (item) {
const enabled = settings[item.id]; const enabled = settings[item.id];
...@@ -157,7 +165,10 @@ DASHBOARD.updateDataPickups = function (settings, dataDashboard) { ...@@ -157,7 +165,10 @@ DASHBOARD.updateDataPickups = function (settings, dataDashboard) {
}); });
}; };
/** Update communication setting from dashboard data */ /**
* Update communication setting from dashboard data
* @param {*} dataDashboard
*/
DASHBOARD.updateDataCommunications = function (dataDashboard) { DASHBOARD.updateDataCommunications = function (dataDashboard) {
DASHBOARD.communicationItems.forEach(function (item) { DASHBOARD.communicationItems.forEach(function (item) {
if (item.id == 'messageList') { if (item.id == 'messageList') {
...@@ -170,7 +181,10 @@ DASHBOARD.updateDataCommunications = function (dataDashboard) { ...@@ -170,7 +181,10 @@ DASHBOARD.updateDataCommunications = function (dataDashboard) {
}); });
}; };
/** Direct to pickup screen */ /**
* Direct to pickup screen
* @param {*} pickupId
*/
DASHBOARD.goPickup = function (pickupId) { DASHBOARD.goPickup = function (pickupId) {
COMMON.goUrlWithCurrentParams('pickup.html', { pickupActive: pickupId }); COMMON.goUrlWithCurrentParams('pickup.html', { pickupActive: pickupId });
}; };
......
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 = {};
HEADER.init = function() {
$("#dspLoginId").text(ClientData.userInfo_loginId());
$("#btnLogout").click(HEADER.logoutFunction);
};
/** Direct home page setting */
HEADER.goToHomePage = function (pageId) {
DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1)
{
HEADER.goDashboard();
}
else
{
HEADER.goOperationList();
}
});
}
HEADER.logoutFunction = function() {
console.log("clicked logout");
$("#msgModel").text(I18N.i18nText('msgLogoutConfirm'));
$("#confirmYes").click(HEADER.processLogout);
}
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 () {
$('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () {
sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.activeInitBottomNav('operationListBottomNav');
TOP.showPage(CONSTANT.PAGE_NAME.OPERATION_LIST);
});
};
/**
* Go page of dashboard
*/
HEADER.goDashboard = function () {
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/login/login.js
...@@ -376,7 +376,10 @@ LOGIN.changePasswordProcess = function () { ...@@ -376,7 +376,10 @@ LOGIN.changePasswordProcess = function () {
); );
}; };
// Change Language English /**
* Change Language English
* @param {*} lang
*/
LOGIN.changeLanguage = function (lang) { LOGIN.changeLanguage = function (lang) {
I18N.changeLanguage(lang); I18N.changeLanguage(lang);
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
...@@ -459,6 +462,10 @@ LOGIN.getServiceOptionList = function () { ...@@ -459,6 +462,10 @@ LOGIN.getServiceOptionList = function () {
}); });
}; };
/**
* login when click enter
* @param {*} e
*/
LOGIN.loginWhenClickEnter = function (e) { LOGIN.loginWhenClickEnter = function (e) {
var code = e.keyCode ? e.keyCode : e.which; var code = e.keyCode ? e.keyCode : e.which;
if (code == 13) { if (code == 13) {
...@@ -493,7 +500,11 @@ LOGIN.initLoginNormalUser = function () { ...@@ -493,7 +500,11 @@ LOGIN.initLoginNormalUser = function () {
$('#txtPassword').keydown(LOGIN.loginWhenClickEnter); $('#txtPassword').keydown(LOGIN.loginWhenClickEnter);
}; };
/* display alert screen */ /**
* display alert screen
* @param {*} errMes
* @param {*} scrMove
*/
LOGIN.showAlertScreen = function (errMes, scrMove) { LOGIN.showAlertScreen = function (errMes, scrMove) {
// アラートメッセージの表示 // アラートメッセージの表示
if (errMes == undefined || errMes == '') { if (errMes == undefined || errMes == '') {
......
abweb/js/notificationContent/notificationContent.js
...@@ -53,6 +53,7 @@ NotificationSelect.selectOperationClick = function () { ...@@ -53,6 +53,7 @@ NotificationSelect.selectOperationClick = function () {
/** /**
* init data, action when screen onload * init data, action when screen onload
* @param selectedCallback
*/ */
NotificationSelect.init = function (selectedCallback) { NotificationSelect.init = function (selectedCallback) {
NotificationSelect.getNotificationSelectData(function (data) { NotificationSelect.getNotificationSelectData(function (data) {
...@@ -65,6 +66,7 @@ NotificationSelect.init = function (selectedCallback) { ...@@ -65,6 +66,7 @@ NotificationSelect.init = function (selectedCallback) {
/** /**
* Implement notification select html * Implement notification select html
* @param pushMessageTemplate
* @returns * @returns
*/ */
NotificationSelect.createNotificationSelectList = function (pushMessageTemplate) { NotificationSelect.createNotificationSelectList = function (pushMessageTemplate) {
......
abweb/js/operationList/operationList.js
...@@ -14,13 +14,6 @@ OL.isOperationGroupMaster = 0; //0: category(operationGroupMaster) not exist 1: ...@@ -14,13 +14,6 @@ OL.isOperationGroupMaster = 0; //0: category(operationGroupMaster) not exist 1:
OL.sortIndex; OL.sortIndex;
OL.operationGroupMasterId; OL.operationGroupMasterId;
OL.REPORT_TYPE = {
REPORTONLY: 0, //report only
INSPECT: 1, //rountine
WITHREPLY: 2, // report answer
WORKFLOW: 3, // continuous
};
/** /**
* process on page load. * process on page load.
* 1.get all data. * 1.get all data.
...@@ -139,6 +132,7 @@ OL.setSearchInfoWeb = function () { ...@@ -139,6 +132,7 @@ OL.setSearchInfoWeb = function () {
/** /**
* create operation list * create operation list
* @param operarionList
*/ */
OL.createOperationList = function (operationList) { OL.createOperationList = function (operationList) {
//Initialization //Initialization
...@@ -154,16 +148,16 @@ OL.createOperationList = function (operationList) { ...@@ -154,16 +148,16 @@ OL.createOperationList = function (operationList) {
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
let classIcon; let classIcon;
switch (operationList[i].reportType) { switch (operationList[i].reportType) {
case OL.REPORT_TYPE.REPORTONLY: case CONSTANT.REPORT_TYPE_INT.REPORT:
classIcon = 'report'; classIcon = 'report';
break; break;
case OL.REPORT_TYPE.INSPECT: case CONSTANT.REPORT_TYPE_INT.ROUTINE:
classIcon = 'inspection'; classIcon = 'inspection';
break; break;
case OL.REPORT_TYPE.WITHREPLY: case CONSTANT.REPORT_TYPE_INT.ANSWER:
classIcon = 'questionary'; classIcon = 'questionary';
break; break;
case OL.REPORT_TYPE.WORKFLOW: case CONSTANT.REPORT_TYPE_INT.WORKFLOW:
classIcon = 'proccess'; classIcon = 'proccess';
break; break;
} }
...@@ -501,8 +495,10 @@ OL.resetSearch = function () { ...@@ -501,8 +495,10 @@ OL.resetSearch = function () {
/** /**
* Transition to the report form or operation list screen * Transition to the report form or operation list screen
* * @param {*} operationId
* @param {String} operationId * @param {*} operationType
* @param {*} reportType
* @param {*} enableAddReport
*/ */
OL.sendOperation = function (operationId, operationType, reportType, enableAddReport) { OL.sendOperation = function (operationId, operationType, reportType, enableAddReport) {
//save operation logs. needed for sorting //save operation logs. needed for sorting
......
abweb/js/operationSelect/operationSelect.js
...@@ -55,6 +55,7 @@ OperationSelect.selectOperationClick = function () { ...@@ -55,6 +55,7 @@ OperationSelect.selectOperationClick = function () {
/** /**
* init data, action when screen onload * init data, action when screen onload
* @param selectedCallback
*/ */
OperationSelect.init = function (selectedCallback) { OperationSelect.init = function (selectedCallback) {
OperationSelect.getOperationSelectData(function (data) { OperationSelect.getOperationSelectData(function (data) {
...@@ -67,6 +68,7 @@ OperationSelect.init = function (selectedCallback) { ...@@ -67,6 +68,7 @@ OperationSelect.init = function (selectedCallback) {
/** /**
* Implement operation select html * Implement operation select html
* @param operarionList
* @returns * @returns
*/ */
OperationSelect.createOperationSelectList = function (operationList) { OperationSelect.createOperationSelectList = function (operationList) {
......
abweb/js/pdfPrint/pdfPrint.js
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
var PP = {}; var PP = {};
/**
* init
*/
PP.init = function () { PP.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
...@@ -14,8 +17,13 @@ PP.init = function () { ...@@ -14,8 +17,13 @@ PP.init = function () {
PP.loadCommon(); PP.loadCommon();
PP.initPdfList(); PP.initPdfList();
COMMON.closeLoading();
}; };
/**
* load common
*/
PP.loadCommon = function () { PP.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () { $('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n(); I18N.initi18n();
...@@ -26,6 +34,9 @@ PP.loadCommon = function () { ...@@ -26,6 +34,9 @@ PP.loadCommon = function () {
}); });
}; };
/**
* init pdf list
*/
PP.initPdfList = function () { PP.initPdfList = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
let params = {}; let params = {};
......
abweb/js/pickup/pickup.js
...@@ -54,6 +54,7 @@ PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.AP ...@@ -54,6 +54,7 @@ PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.AP
/** /**
* Call get new report list api get data * Call get new report list api get data
* @param callback
*/ */
PICKUP.getNewreportListData = function (callback) { PICKUP.getNewreportListData = function (callback) {
let param = { let param = {
...@@ -150,6 +151,7 @@ PICKUP.init = function () { ...@@ -150,6 +151,7 @@ PICKUP.init = function () {
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null);
PICKUP.initSettingActivePickup(); PICKUP.initSettingActivePickup();
PICKUP.settingPickup(); PICKUP.settingPickup();
COMMON.closeLoading();
}; };
/** /**
* Setting pickup data * Setting pickup data
...@@ -558,6 +560,11 @@ PICKUP.initWarningReportWithReportOnlyType = function (report) { ...@@ -558,6 +560,11 @@ PICKUP.initWarningReportWithReportOnlyType = function (report) {
return ele; return ele;
}; };
/**
* init Warning Report With Inspect Type
* @param {*} report
* @returns
*/
PICKUP.initWarningReportWithInspectType = function (report) { PICKUP.initWarningReportWithInspectType = function (report) {
let ele = $( let ele = $(
"<li class='card mb-2'>" + "<li class='card mb-2'>" +
...@@ -735,57 +742,56 @@ PICKUP.getInspectDate = function (dateString) { ...@@ -735,57 +742,56 @@ PICKUP.getInspectDate = function (dateString) {
/** /**
* send data to open report form from New report pickup * send data to open report form from New report pickup
* @param operarionId
* @returns * @returns
*/ */
PICKUP.sendReportFormFromNewReport = function (operationId) { PICKUP.sendReportFormFromNewReport = function (operationId) {
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
let params = {}; const url = 'reportForm.html?operationId=' + operationId;
params.sid = COMMON.getSid(); COMMON.avwScreenMove(url);
params.operationId = operationId;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
COMMON.postCommunication(url, params);
}; };
/** /**
* send data to open report form of event click continuous work operation report * send data to open report form of event click continuous work operation report
* @returns * @param {*} operationId
* @param {*} taskKey
* @param {*} processKey
* @param {*} phaseNo
*/ */
PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, processKey, phaseNo) { PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, processKey, phaseNo) {
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
let params = {}; const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo;
params.sid = COMMON.getSid(); COMMON.avwScreenMove(url);
params.operationId = operationId;
params.processKey = processKey;
params.phaseNo = phaseNo;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
COMMON.postCommunication(url, params);
}; };
/** /**
* send data to open report form of event click warning operation report * send data to open report form of event click warning operation reports
* @returns * @param {*} operationId
* @param {*} reportType
* @param {*} taskKey
* @param {*} processKey
* @param {*} phaseNo
* @param {*} replyNo
*/ */
PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) { PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
let params = {}; let url = 'reportForm.html?operationId=' + operationId;
params.sid = COMMON.getSid();
params.operationId = operationId;
switch (reportType) { switch (reportType) {
case PICKUP.REPORT_TYPE.REPORTONLY: case PICKUP.REPORT_TYPE.REPORTONLY:
params.taskKey = taskKey; url += '&taskKey' + taskKey;
break; break;
case PICKUP.REPORT_TYPE.INSPECT: case PICKUP.REPORT_TYPE.INSPECT:
params.taskKey = taskKey; url += '&taskKey' + taskKey;
break; break;
case PICKUP.REPORT_TYPE.WITHREPLY: case PICKUP.REPORT_TYPE.WITHREPLY:
params.replyNo = replyNo; url += '&taskKey' + taskKey;
url += '&replyNO' + replyNo;
break; break;
case PICKUP.REPORT_TYPE.WORKFLOW: case PICKUP.REPORT_TYPE.WORKFLOW:
params.processKey = processKey; url += '&processKey' + processKey;
params.phaseNo = phaseNo; url += '&phaseNo' + phaseNo;
break; break;
} }
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM; COMMON.avwScreenMove(url);
COMMON.postCommunication(url, params);
}; };
abweb/js/pushMessageDetail/pushMessageDetail.js
...@@ -48,6 +48,7 @@ PushMessageDetail.init = function () { ...@@ -48,6 +48,7 @@ PushMessageDetail.init = function () {
PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function (message) { PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function (message) {
PushMessageDetail.showMessage(message); PushMessageDetail.showMessage(message);
}); });
COMMON.closeLoading();
}; };
/** /**
......
abweb/js/pushMessageList/pushMessageList.js
...@@ -25,6 +25,7 @@ PushMessageList.init = function () { ...@@ -25,6 +25,7 @@ PushMessageList.init = function () {
PushMessageList.getMessageList(function (messageList) { PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList); PushMessageList.generateMessageListHtml(messageList.pushMessageList);
}); });
COMMON.closeLoading();
}; };
/** /**
......
abweb/js/reportForm/reportForm.js
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
var RF = {}; var RF = {};
/**
* init
*/
RF.init = function () { RF.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
...@@ -14,6 +17,9 @@ RF.init = function () { ...@@ -14,6 +17,9 @@ RF.init = function () {
RF.initFormView(); RF.initFormView();
}; };
/**
* load common
*/
RF.loadCommon = function () { RF.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () { $('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n(); I18N.initi18n();
...@@ -24,6 +30,9 @@ RF.loadCommon = function () { ...@@ -24,6 +30,9 @@ RF.loadCommon = function () {
}); });
}; };
/**
* iinit form view
*/
RF.initFormView = function () { RF.initFormView = function () {
const urlParameterList = COMMON.getUrlParameter(); const urlParameterList = COMMON.getUrlParameter();
const operationId = urlParameterList['operationId']; const operationId = urlParameterList['operationId'];
...@@ -36,6 +45,7 @@ RF.initFormView = function () { ...@@ -36,6 +45,7 @@ RF.initFormView = function () {
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
params.lang = I18N.getCurrentLanguage;
if (taskKey) params.taskKey = taskKey; if (taskKey) params.taskKey = taskKey;
if (replyNo) params.replyNo = replyNo; if (replyNo) params.replyNo = replyNo;
if (processKey) params.processKey = processKey; if (processKey) params.processKey = processKey;
...@@ -44,6 +54,7 @@ RF.initFormView = function () { ...@@ -44,6 +54,7 @@ RF.initFormView = function () {
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
$('#report-form').load(url, params, function () { $('#report-form').load(url, params, function () {
initPageLoad(); initPageLoad();
COMMON.closeLoading();
}); });
} else { } else {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
......
abweb/js/reportList/reportList.js
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
var RL = {}; var RL = {};
/**
* init
*/
RL.init = function () { RL.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
...@@ -13,11 +16,15 @@ RL.init = function () { ...@@ -13,11 +16,15 @@ RL.init = function () {
RL.checkQuickReport(); RL.checkQuickReport();
RL.loadCommon(); RL.loadCommon();
RL.initTaskReportList(); RL.initTaskReportList();
COMMON.closeLoading();
}; };
RL.loadCommon = function() { /**
TEMPLATE.loadHearder("#includedHeader"); * load common
TEMPLATE.loadConfirmModal("#includedConfirmModal"); */
RL.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
...@@ -27,30 +34,42 @@ RL.loadCommon = function() { ...@@ -27,30 +34,42 @@ RL.loadCommon = function() {
titleLang: 'pickup', titleLang: 'pickup',
}, },
]; ];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "reportList", navs, RL.loadMainTitleCallback); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'reportList', navs, RL.loadMainTitleCallback);
} };
RL.isQuickReport; RL.isQuickReport;
RL.checkQuickReport = function() { /**
* check quick report
*/
RL.checkQuickReport = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId; params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST; params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
COMMON.cmsAjax(url, params, false, function(result) { COMMON.cmsAjax(
url,
params,
false,
function (result) {
RL.isQuickReport = result.isQuickReport; RL.isQuickReport = result.isQuickReport;
}, function() { },
COMMON.displayAlert("msgOperationEmpty"); function () {
COMMON.avwScreenMove("index.html"); COMMON.displayAlert('msgOperationEmpty');
}); COMMON.avwScreenMove('index.html');
},
);
} else { } else {
COMMON.displayAlert("error"); COMMON.displayAlert('error');
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} }
} };
/**
* init task report list
*/
RL.initTaskReportList = function () { RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
let params = {}; let params = {};
...@@ -65,10 +84,12 @@ RL.initTaskReportList = function () { ...@@ -65,10 +84,12 @@ RL.initTaskReportList = function () {
} }
}; };
/**
* load main title callcack
*/
RL.loadMainTitleCallback = function () { RL.loadMainTitleCallback = function () {
//add dashboard setting item //add dashboard setting item
if (RL.isQuickReport) { if (RL.isQuickReport) {
var elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'); var elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">');
let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">'); let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">');
elmImg.attr('title', I18N.i18nText('reportList')); elmImg.attr('title', I18N.i18nText('reportList'));
...@@ -77,6 +98,9 @@ RL.loadMainTitleCallback = function () { ...@@ -77,6 +98,9 @@ RL.loadMainTitleCallback = function () {
} }
}; };
/**
* go pdf print
*/
RL.goPdfPrint = function () { RL.goPdfPrint = function () {
COMMON.avwScreenMove('pdfPrint.html'); COMMON.avwScreenMove('pdfPrint.html');
}; };
abweb/js/sendMessage/sendMessage.js
...@@ -101,11 +101,20 @@ SendMessage.postMessage = function (message, operationId, sendType) { ...@@ -101,11 +101,20 @@ SendMessage.postMessage = function (message, operationId, sendType) {
); );
}; };
/**
* operation selected callback
* @param {Number} operationId
* @param {*} operationName
*/
SendMessage.operationSelectedCallback = function (operationId, operationName) { SendMessage.operationSelectedCallback = function (operationId, operationName) {
$('#operationSelected').attr('data-operation-id', operationId); $('#operationSelected').attr('data-operation-id', operationId);
$('#operationSelected').text(operationName); $('#operationSelected').text(operationName);
}; };
/**
* template selected callback
* @param {*} template
*/
SendMessage.templateSelectedCallback = function (template) { SendMessage.templateSelectedCallback = function (template) {
$('#messageContent').val(template); $('#messageContent').val(template);
}; };
...@@ -134,4 +143,6 @@ SendMessage.init = function () { ...@@ -134,4 +143,6 @@ SendMessage.init = function () {
I18N.initi18n(); I18N.initi18n();
$("label[for='sendTypeGroup']").append(I18N.i18nText('labelSendTypeGroup')); $("label[for='sendTypeGroup']").append(I18N.i18nText('labelSendTypeGroup'));
$("label[for='sendTypeAll']").append(I18N.i18nText('labelSendTypeAll')); $("label[for='sendTypeAll']").append(I18N.i18nText('labelSendTypeAll'));
COMMON.closeLoading();
}; };
abweb/js/setting/settings.js
...@@ -11,9 +11,13 @@ $(document).ready(function () { ...@@ -11,9 +11,13 @@ $(document).ready(function () {
COMMON.checkAuth(false); COMMON.checkAuth(false);
SETTINGS.initScreen(); SETTINGS.initScreen();
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click); $('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
COMMON.closeLoading();
}); });
// Process changing password /**
* Process changing password
* @param {*} e
*/
SETTINGS.dspPwdUpd1_Click = function (e) { SETTINGS.dspPwdUpd1_Click = function (e) {
e.preventDefault(); e.preventDefault();
var isOK = true; var isOK = true;
...@@ -85,6 +89,10 @@ SETTINGS.dspPwdUpd1_Click = function (e) { ...@@ -85,6 +89,10 @@ SETTINGS.dspPwdUpd1_Click = function (e) {
} }
}; };
/**
* password change success
* @param {*} data
*/
SETTINGS.avwCmsApi_passwordChange_success = function (data) { SETTINGS.avwCmsApi_passwordChange_success = function (data) {
// OK // OK
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
...@@ -101,6 +109,13 @@ SETTINGS.avwCmsApi_passwordChange_success = function (data) { ...@@ -101,6 +109,13 @@ SETTINGS.avwCmsApi_passwordChange_success = function (data) {
COMMON.displayAlert('msgPwdChangeOK'); COMMON.displayAlert('msgPwdChangeOK');
} }
}; };
/**
* password change fail
* @param {*} xhr
* @param {*} b
* @param {*} c
*/
SETTINGS.avwCmsApi_passwordChange_fail = function (xhr, b, c) { SETTINGS.avwCmsApi_passwordChange_fail = function (xhr, b, c) {
/* show error messages */ /* show error messages */
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
......
abweb/js/template/template.js
...@@ -31,14 +31,21 @@ TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) { ...@@ -31,14 +31,21 @@ TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) {
}); });
}; };
/** Template load confirm model */ /**
* Template load confirm model
* @param {*} elmentId
*/
TEMPLATE.loadConfirmModal = function (elmentId) { TEMPLATE.loadConfirmModal = function (elmentId) {
$(elmentId).load('../common/html/confirmModal.html', function () { $(elmentId).load('../common/html/confirmModal.html', function () {
I18N.initi18n(); I18N.initi18n();
}); });
}; };
/** Template load operation select */ /**
* Template load operation select
* @param {*} elmentId
* @param {*} selectCallback
*/
TEMPLATE.loadOperationSelect = function (elmentId, selectCallback) { TEMPLATE.loadOperationSelect = function (elmentId, selectCallback) {
$(elmentId).load('operationSelect.html', function () { $(elmentId).load('operationSelect.html', function () {
OperationSelect.init(selectCallback); OperationSelect.init(selectCallback);
...@@ -55,7 +62,11 @@ TEMPLATE.showModalConfirm = function () { ...@@ -55,7 +62,11 @@ TEMPLATE.showModalConfirm = function () {
}); });
}; };
/** Template load notification content*/ /**
* Template load notification content
* @param {*} elmentId
* @param {*} selectCallback
*/
TEMPLATE.loadNotificationSelect = function (elmentId, selectCallback) { TEMPLATE.loadNotificationSelect = function (elmentId, selectCallback) {
$(elmentId).load('notificationContent.html', function () { $(elmentId).load('notificationContent.html', function () {
NotificationSelect.init(selectCallback); NotificationSelect.init(selectCallback);
......
abweb/js/topPage/topPage.js
...@@ -8,14 +8,10 @@ ...@@ -8,14 +8,10 @@
var TOP = {}; var TOP = {};
$(document).ready(function () { $(document).ready(function () {
//setting lang info
COMMON.setLangCodeWeb();
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
//setting msg of html //setting msg of html
COMMON.updateLang();
TOP.init(); TOP.init();
}); });
...@@ -23,7 +19,6 @@ $(document).ready(function () { ...@@ -23,7 +19,6 @@ $(document).ready(function () {
* show page * show page
*/ */
TOP.init = function () { TOP.init = function () {
COMMON.showLoading();
HEADER.goToHomePage(); HEADER.goToHomePage();
COMMON.closeLoading(); COMMON.closeLoading();
}; };
......
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