Skip to content

C
check
Commit 10876628 by Kang Donghun
Options

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

# Conflicts:
#	abweb/common/js/header.js
#	abweb/html/pdfPrint.html
#	abweb/html/reportForm.html
#	abweb/html/reportList.html
#	abweb/js/header/header.js
parents 0a0a151f a1be92e9
Showing with 308 additions and 188 deletions
abweb/common/js/constant.js
......@@ -66,7 +66,6 @@ CONSTANT.URL = {
PUSH_MESSAGE_LIST: 'pushMessageList/',
SEND_PUSH_MESSAGE: 'sendPushMessage/',
IS_QUICK_REPORT: 'getOperationData/isQuickReport',
},
HTML: {
BASE: 'html/',
......@@ -136,35 +135,3 @@ CONSTANT.KEYS = {
// Local:
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 () {
hide_del_btn();
});
......@@ -138,18 +144,3 @@ $('.view-menu .view-block-btn').on('click', function () {
$('.view-content').removeClass('view-list');
$('.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,7 +5,10 @@
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
var HEADER = {};
var HEADER = {};
$(function () {
COMMON.showLoading();
});
HEADER.init = function() {
$("#dspLoginId").text(ClientData.userInfo_loginId());
......
abweb/common/js/i18n.js
/**
* ABook Viewer for WEB
* 国際化（言語切替）対応共通処理
* Common processing for internationalization (language switching)
*
* 言語リソースファイルは、指定する言語に合わせて以下のファイルを修正する
* - 日本語：　lang-ja.json
* - 韓国語：　lang-ko.json
* - 英語　：　lang-en.json
* For language resource files, modify the following files according to the language you specify
* - ja：　lang-ja.json
* - ko：　lang-ko.json
* - en　：　lang-en.json
*
* Copyright (C) Agentec Co, Ltd. All rights reserved.
*/
//グローバルの名前空間用のオブジェクトを用意する
//Prepare objects for the global namespace
var I18N = {};
/**
* 定数：言語ファイル配置場所
* Constant: Language file location
*/
I18N.avwsys_location = '';
I18N.avwsys_dir = '';
I18N.avwsys_storagekey = '';
I18N.avwsys_currLang = '';
/* 言語の初期化 */
/* Language initialization */
$(function () {
I18N.initi18n();
});
/** 言語リソース設定初期化 */
/** Initialization of language resource settings */
I18N.initi18n = function () {
I18N.avwsys_location = '/common/json/lang';
I18N.avwsys_dir = '/abweb';
I18N.avwsys_storagekey = 'AVWUS_Lang';
I18N.avwsys_currLang = 'AVW_CurrLang';
// ログイン画面/直接アクセス対策
// Login screen/direct access measures
var location = window.location.toString().toLowerCase();
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;
} else {
// I18N.avwsys_dirディレクトリ配下の場合は、相対パスに変換
// If under I18N.avwsys_dir directory, convert to relative path
I18N.avwsys_location = '..' + I18N.avwsys_location;
}
......@@ -51,15 +51,15 @@ I18N.initi18n = function () {
lang = I18N.getNavigatorLanguage();
}
}
// 言語ファイルを初期化する
// Initialize language files
I18N.loadLanguage(lang);
};
/* ブラウザの言語設定を取得する */
/* Retrieve browser language settings */
I18N.getNavigatorLanguage = function () {
var lang = navigator.browserLanguage || navigator.language || navigator.userLanguage;
/* 対応言語 */
var languages = ['ja', 'ko', 'en']; // 対応言語を増やす場合はここを変更する
/* Languages Supported */
var languages = ['ja', 'ko', 'en']; // Change here if you want to add more supported languages
if (lang.match(/ja|ko|en/g)) {
for (var i = 0; i < languages.length; i++) {
var index = lang.indexOf(languages[i]);
......@@ -69,31 +69,34 @@ I18N.getNavigatorLanguage = function () {
}
}
} else {
lang = 'en'; // 対応言語が無ければ英語をデフォルトとする
lang = 'en'; // If there is no supported language, English is the default.
}
return lang;
};
/* 言語リソースファイル読み込み */
/**
* Language resource file loading
* @param {*} lang
*/
I18N.loadLanguage = function (lang) {
// 引数から言語ファイルを選択
// Select language file from arguments
var langfile = 'lang-' + lang + '.json';
// 言語ファイルを読み込む
// Read the language file
$.ajax({
url: I18N.avwsys_location + '/' + langfile,
async: false,
dataType: 'json',
cache: false,
success: function (data) {
// lang属性の書換え
// Rewriting the lang attribute
document.documentElement.lang = lang;
// html の言語データを書換える
// Rewrite html language data
var jsonLangData = data;
I18N.replaceText(jsonLangData);
// 言語設定、言語データをストレージにキャッシュしておく
// Cache language settings and language data in storage
I18N.storeCurrentLanguage(lang, jsonLangData);
},
error: function (xhr, txtStatus, errorThrown) {
......@@ -104,7 +107,10 @@ I18N.loadLanguage = function (lang) {
});
};
/* ページ内のテキストをすべて言語に合わせて置換する */
/**
* Replace all text on the page with the language
* @param {*} jsonLangData
*/
I18N.replaceText = function (jsonLangData) {
var itemCount = $('.lang').length;
if (itemCount > 0) {
......@@ -137,7 +143,7 @@ I18N.replaceText = function (jsonLangData) {
}
};
/* 現在設定されている言語でHTMLテキストを置き換える */
/* Replace HTML text with the currently set language */
I18N.i18nReplaceText = function () {
var storage = window.sessionStorage;
if (storage) {
......@@ -149,7 +155,11 @@ I18N.i18nReplaceText = function () {
}
};
/* キーから文字列を取得 */
/**
* Get string from key
* @param {*} key
* @returns
*/
I18N.i18nText = function (key) {
var storage = window.sessionStorage;
if (storage) {
......@@ -162,7 +172,12 @@ I18N.i18nText = function (key) {
return 'undefined';
};
/* 言語データのキー値から文字列を取得 */
/**
* Obtain strings from key values of language data
* @param {*} jsonLangData
* @param {*} key
* @returns
*/
I18N.getLangText = function (jsonLangData, key) {
if (jsonLangData) {
var text = jsonLangData[key];
......@@ -171,19 +186,26 @@ I18N.getLangText = function (jsonLangData, key) {
return 'undefined.';
};
/* 言語データの切り替え */
/**
* Switching Language Data
* @param {*} lang
*/
I18N.changeLanguage = function (lang) {
// 言語の切替を行った場合のみ選択言語をストアする
// Store the selected language only when switching languages
var storage = window.localStorage;
if (storage) {
storage.setItem(I18N.avwsys_storagekey, lang);
}
// 言語ファイルを読み込み、テキスト文字列を変換する
// Reads language files and converts text strings
I18N.loadLanguage(lang);
};
/* 設定言語の保存 */
/**
* Save language settings
* @param {*} lang
* @param {*} langData
*/
I18N.storeCurrentLanguage = function (lang, langData) {
var ss = window.sessionStorage;
if (ss) {
......@@ -193,7 +215,7 @@ I18N.storeCurrentLanguage = function (lang, langData) {
ss.setItem(I18N.avwsys_currLang, lang);
}
};
/* 設定言語の取得 */
/* Retrieving the setting language */
I18N.getCurrentLanguage = function () {
var lang;
var storage = window.sessionStorage;
......
abweb/common/js/validation.js
/*
/**
* String utilities [ end ]
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
// =============================================================================================
// Utils for string, date, number [ end ]
// =============================================================================================
var ValidationUtil = {
// Required Text
CheckRequiredForText : function(value) {
CheckRequiredForText: function (value) {
if (value == null || value == '') {
return false;
}
......@@ -17,13 +17,12 @@ var ValidationUtil = {
},
// get byte count
GetByteCount : function(value) {
GetByteCount: function (value) {
var escapedStr = encodeURI(value);
if (escapedStr.indexOf("%") != -1) {
var count = escapedStr.split("%").length - 1;
if (count == 0)
count++; // perverse case; can't happen with real UTF-8
var tmp = escapedStr.length - (count * 3);
if (escapedStr.indexOf('%') != -1) {
var count = escapedStr.split('%').length - 1;
if (count == 0) count++; // perverse case; can't happen with real UTF-8
var tmp = escapedStr.length - count * 3;
count = count + tmp;
} else {
count = escapedStr.length;
......@@ -32,65 +31,64 @@ var ValidationUtil = {
},
// check text min length
CheckMinLengthForByte : function(value, len) {
if (this.GetByteCount(value) < len)
return false;
CheckMinLengthForByte: function (value, len) {
if (this.GetByteCount(value) < len) return false;
return true;
},
// check text max length
CheckMaxLengthForByte : function(value, len) {
if (this.GetByteCount(value) > len)
return false;
CheckMaxLengthForByte: function (value, len) {
if (this.GetByteCount(value) > len) return false;
return true;
},
// check if the text is a number
IsNumber : function(value) {
var reg = new RegExp("^[0-9]+$");
IsNumber: function (value) {
var reg = new RegExp('^[0-9]+$');
return reg.test(value);
},
// check if the text is a alphabet
IsAlphabet : function(value) {
var reg = new RegExp("^[a-zA-Z]+$");
IsAlphabet: function (value) {
var reg = new RegExp('^[a-zA-Z]+$');
return reg.test(value);
},
// check if the text is a symbol
IsSymbol : function(value) {
IsSymbol: function (value) {
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);
},
// check if the text is a emailAddress
CheckEmailValid : function(value) {
CheckEmailValid: function (value) {
// 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);
},
// Password
CheckPasswordValid : function(value) {
CheckPasswordValid: function (value) {
// 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);
},
// Alphabet + Nunber + Symbol
IsAlphabetOrNumberOrSymbol : function(value) {
IsAlphabetOrNumberOrSymbol: function (value) {
// Check if string is alphabet or number or symbol
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);
},
// Get the total of types in array
CheckNumberOfTypeInString : function(value) {
CheckNumberOfTypeInString: function (value) {
var list = new Array();
var c;
for ( var i = 0; i < value.length; i++) {
for (var i = 0; i < value.length; 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) {
value = value.slice(0, j) + value.slice(j + 1, value.len);
j = j - 1;
......@@ -99,31 +97,30 @@ var ValidationUtil = {
list[i] = c;
}
var count = list.length;
return count
return count;
},
// Special character: *
IsCharacterSpecial : function(value) {
for ( var i = 0; i < value.length; i++) {
if (value[i] == '*')
return true;
IsCharacterSpecial: function (value) {
for (var i = 0; i < value.length; i++) {
if (value[i] == '*') return true;
}
return false;
},
// Symbol check for password
IsPasswordSymbol : function(value) {
var reg = new RegExp("\u005b\u005e\u0027\u0023\u0027\u002b\u005c\u002d\u0027\u002e\u0027\u002f\u0027\u003a\u0027\u005f\u005d");
IsPasswordSymbol: function (value) {
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);
},
// text check for password(Alphabet Or Number Or Symbol)
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");
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');
return !reg.test(value);
},
// Check at consecutive characters
HasSeqChar : function(str, num) {
HasSeqChar: function (str, num) {
var count = 0;
var prev = 0;
......@@ -134,8 +131,7 @@ var ValidationUtil = {
if (count == num - 1) {
return true;
}
}
else {
} else {
count = 0;
}
prev = c;
......@@ -145,7 +141,7 @@ var ValidationUtil = {
},
// Check same characters in text
ContainSameSeqChar : function(str1, str2, num) {
ContainSameSeqChar: function (str1, str2, num) {
if (str2.length < num || str1.length < num) {
return false;
}
......@@ -157,5 +153,5 @@ var ValidationUtil = {
}
}
return false;
}
},
};
abweb/html/accountSetting.html
......@@ -27,7 +27,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
......@@ -97,9 +97,9 @@
<!-- confirm -->
<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>
</html>
abweb/html/dashboard.html
......@@ -38,6 +38,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<!-- dashboard -->
......@@ -68,5 +69,6 @@
<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>
</html>
\ No newline at end of file
abweb/html/index.html
......@@ -21,8 +21,6 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
......@@ -31,11 +29,11 @@
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="../js/template/template.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__" defer></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<!-- task list -->
......@@ -147,5 +145,8 @@
<p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='######' /></div>
</div>
</div>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
abweb/html/pdfPrint.html
......@@ -28,6 +28,10 @@
<script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
<<<<<<< HEAD
=======
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
>>>>>>> feature/1.0_check_web_dev
<script type="text/javascript">
$(document).ready(function() {
PP.init();
......@@ -36,7 +40,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
......@@ -61,10 +65,9 @@
<!-- confirm -->
<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>
</html>
\ No newline at end of file
abweb/html/pickup.html
......@@ -42,7 +42,8 @@
</script>
</head>
<body >
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div>
<!-- pickup -->
<main>
......@@ -141,6 +142,7 @@
<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>
</html>
\ No newline at end of file
abweb/html/pushMessageDetail.html
......@@ -33,7 +33,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<!-- message detail -->
......@@ -73,6 +73,7 @@
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/pushMessageList.html
......@@ -33,8 +33,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div>
<!-- message list -->
<main>
......@@ -54,5 +53,6 @@
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/html/reportForm.html
......@@ -21,13 +21,13 @@
<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/header.js?__UPDATEID__"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head>
<body onload="RF.init();">
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
......@@ -62,5 +62,6 @@
<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>
</html>
\ No newline at end of file
abweb/html/reportList.html
......@@ -36,8 +36,8 @@
</script>
</head>
<body >
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
......@@ -47,9 +47,9 @@
<!-- confirm -->
<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>
</html>
abweb/html/sendMessage.html
......@@ -36,7 +36,7 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div>
<!-- send message -->
<main>
......@@ -91,6 +91,7 @@
<div id="includeTemplateModal"></div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</body>
</html>
\ No newline at end of file
abweb/js/dashboard/dashboard.js
......@@ -31,6 +31,7 @@ DASHBOARD.getDataApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientDat
/**
* Call api get data
* @param callback
*/
DASHBOARD.getDashboardData = function (callback) {
let param = {
......@@ -82,7 +83,11 @@ DASHBOARD.initCommunications = function () {
});
};
/** Initialization dashboard items html */
/**
* Initialization dashboard items html
* @param {*} item
* @returns
*/
DASHBOARD.initHtmlItem = function (item) {
let countText = '' + item.count;
if (item.count >= 100) {
......@@ -134,6 +139,7 @@ DASHBOARD.init = function () {
DASHBOARD.initCommunications();
});
});
COMMON.closeLoading();
};
/** load common data */
DASHBOARD.loadCommon = function () {
......@@ -143,7 +149,11 @@ DASHBOARD.loadCommon = function () {
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.pickupItems.forEach(function (item) {
const enabled = settings[item.id];
......@@ -157,7 +167,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.communicationItems.forEach(function (item) {
if (item.id == 'messageList') {
......@@ -170,7 +183,10 @@ DASHBOARD.updateDataCommunications = function (dataDashboard) {
});
};
/** Direct to pickup screen */
/**
* Direct to pickup screen
* @param {*} pickupId
*/
DASHBOARD.goPickup = function (pickupId) {
COMMON.goUrlWithCurrentParams('pickup.html', { pickupActive: pickupId });
};
......
abweb/js/login/login.js
......@@ -376,7 +376,10 @@ LOGIN.changePasswordProcess = function () {
);
};
// Change Language English
/**
* Change Language English
* @param {*} lang
*/
LOGIN.changeLanguage = function (lang) {
I18N.changeLanguage(lang);
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
......@@ -459,6 +462,10 @@ LOGIN.getServiceOptionList = function () {
});
};
/**
* login when click enter
* @param {*} e
*/
LOGIN.loginWhenClickEnter = function (e) {
var code = e.keyCode ? e.keyCode : e.which;
if (code == 13) {
......@@ -493,7 +500,11 @@ LOGIN.initLoginNormalUser = function () {
$('#txtPassword').keydown(LOGIN.loginWhenClickEnter);
};
/* display alert screen */
/**
* display alert screen
* @param {*} errMes
* @param {*} scrMove
*/
LOGIN.showAlertScreen = function (errMes, scrMove) {
// アラートメッセージの表示
if (errMes == undefined || errMes == '') {
......
abweb/js/notificationContent/notificationContent.js
......@@ -53,6 +53,7 @@ NotificationSelect.selectOperationClick = function () {
/**
* init data, action when screen onload
* @param selectedCallback
*/
NotificationSelect.init = function (selectedCallback) {
NotificationSelect.getNotificationSelectData(function (data) {
......@@ -65,6 +66,7 @@ NotificationSelect.init = function (selectedCallback) {
/**
* Implement notification select html
* @param pushMessageTemplate
* @returns
*/
NotificationSelect.createNotificationSelectList = function (pushMessageTemplate) {
......
abweb/js/operationList/operationList.js
......@@ -14,13 +14,6 @@ OL.isOperationGroupMaster = 0; //0: category(operationGroupMaster) not exist 1:
OL.sortIndex;
OL.operationGroupMasterId;
OL.REPORT_TYPE = {
REPORTONLY: 0, //report only
INSPECT: 1, //rountine
WITHREPLY: 2, // report answer
WORKFLOW: 3, // continuous
};
/**
* process on page load.
* 1.get all data.
......@@ -139,6 +132,7 @@ OL.setSearchInfoWeb = function () {
/**
* create operation list
* @param operarionList
*/
OL.createOperationList = function (operationList) {
//Initialization
......@@ -501,8 +495,10 @@ OL.resetSearch = function () {
/**
* Transition to the report form or operation list screen
*
* @param {String} operationId
* @param {*} operationId
* @param {*} operationType
* @param {*} reportType
* @param {*} enableAddReport
*/
OL.sendOperation = function (operationId, operationType, reportType, enableAddReport) {
//save operation logs. needed for sorting
......
abweb/js/operationSelect/operationSelect.js
......@@ -55,6 +55,7 @@ OperationSelect.selectOperationClick = function () {
/**
* init data, action when screen onload
* @param selectedCallback
*/
OperationSelect.init = function (selectedCallback) {
OperationSelect.getOperationSelectData(function (data) {
......@@ -67,6 +68,7 @@ OperationSelect.init = function (selectedCallback) {
/**
* Implement operation select html
* @param operarionList
* @returns
*/
OperationSelect.createOperationSelectList = function (operationList) {
......
abweb/js/pdfPrint/pdfPrint.js
......@@ -6,6 +6,9 @@
var PP = {};
/**
* init
*/
PP.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
......@@ -14,8 +17,13 @@ PP.init = function () {
PP.loadCommon();
PP.initPdfList();
COMMON.closeLoading();
};
/**
* load common
*/
PP.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
......@@ -26,6 +34,9 @@ PP.loadCommon = function () {
});
};
/**
* init pdf list
*/
PP.initPdfList = function () {
if (sessionStorage.OL_operationId) {
let params = {};
......
abweb/js/pickup/pickup.js
......@@ -54,6 +54,7 @@ PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.AP
/**
* Call get new report list api get data
* @param callback
*/
PICKUP.getNewreportListData = function (callback) {
let param = {
......@@ -150,6 +151,7 @@ PICKUP.init = function () {
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null);
PICKUP.initSettingActivePickup();
PICKUP.settingPickup();
COMMON.closeLoading();
};
/**
* Setting pickup data
......@@ -558,6 +560,11 @@ PICKUP.initWarningReportWithReportOnlyType = function (report) {
return ele;
};
/**
* init Warning Report With Inspect Type
* @param {*} report
* @returns
*/
PICKUP.initWarningReportWithInspectType = function (report) {
let ele = $(
"<li class='card mb-2'>" +
......@@ -735,6 +742,7 @@ PICKUP.getInspectDate = function (dateString) {
/**
* send data to open report form from New report pickup
* @param operarionId
* @returns
*/
PICKUP.sendReportFormFromNewReport = function (operationId) {
......@@ -748,7 +756,10 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
/**
* 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) {
//Transition to the report form or operation list screen
......@@ -762,8 +773,13 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
};
/**
* send data to open report form of event click warning operation report
* @returns
* send data to open report form of event click warning operation reports
* @param {*} operationId
* @param {*} reportType
* @param {*} taskKey
* @param {*} processKey
* @param {*} phaseNo
* @param {*} replyNo
*/
PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
//Transition to the report form or operation list screen
......
abweb/js/pushMessageDetail/pushMessageDetail.js
......@@ -48,6 +48,7 @@ PushMessageDetail.init = function () {
PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function (message) {
PushMessageDetail.showMessage(message);
});
COMMON.closeLoading();
};
/**
......
abweb/js/pushMessageList/pushMessageList.js
......@@ -25,6 +25,7 @@ PushMessageList.init = function () {
PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList);
});
COMMON.closeLoading();
};
/**
......
abweb/js/reportForm/reportForm.js
......@@ -5,6 +5,9 @@
var RF = {};
/**
* init
*/
RF.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
......@@ -12,8 +15,12 @@ RF.init = function () {
RF.loadCommon();
RF.initFormView();
COMMON.closeLoading();
};
/**
* load common
*/
RF.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
......@@ -24,6 +31,9 @@ RF.loadCommon = function () {
});
};
/**
* iinit form view
*/
RF.initFormView = function () {
const urlParameterList = COMMON.getUrlParameter();
const operationId = urlParameterList['operationId'];
......@@ -36,6 +46,7 @@ RF.initFormView = function () {
params.sid = COMMON.getSid();
params.operationId = operationId;
params.lang = I18N.getCurrentLanguage;
if (taskKey) params.taskKey = taskKey;
if (replyNo) params.replyNo = replyNo;
if (processKey) params.processKey = processKey;
......
abweb/js/reportList/reportList.js
......@@ -6,6 +6,9 @@
var RL = {};
/**
* init
*/
RL.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
......@@ -13,11 +16,15 @@ RL.init = function () {
RL.checkQuickReport();
RL.loadCommon();
RL.initTaskReportList();
COMMON.closeLoading();
};
RL.loadCommon = function() {
TEMPLATE.loadHearder("#includedHeader");
TEMPLATE.loadConfirmModal("#includedConfirmModal");
/**
* load common
*/
RL.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
titleLang: 'dashboard',
......@@ -27,30 +34,42 @@ RL.loadCommon = function() {
titleLang: 'pickup',
},
];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "reportList", navs, RL.loadMainTitleCallback);
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'reportList', navs, RL.loadMainTitleCallback);
};
RL.isQuickReport;
RL.checkQuickReport = function() {
/**
* check quick report
*/
RL.checkQuickReport = function () {
if (sessionStorage.OL_operationId) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
COMMON.cmsAjax(url, params, false, function(result) {
COMMON.cmsAjax(
url,
params,
false,
function (result) {
RL.isQuickReport = result.isQuickReport;
}, function() {
COMMON.displayAlert("msgOperationEmpty");
COMMON.avwScreenMove("index.html");
});
},
function () {
COMMON.displayAlert('msgOperationEmpty');
COMMON.avwScreenMove('index.html');
},
);
} else {
COMMON.displayAlert("error");
COMMON.avwScreenMove("index.html");
COMMON.displayAlert('error');
COMMON.avwScreenMove('index.html');
}
}
};
/**
* init task report list
*/
RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) {
let params = {};
......@@ -65,10 +84,12 @@ RL.initTaskReportList = function () {
}
};
/**
* load main title callcack
*/
RL.loadMainTitleCallback = function () {
//add dashboard setting item
if (RL.isQuickReport) {
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出力">');
elmImg.attr('title', I18N.i18nText('reportList'));
......@@ -77,6 +98,9 @@ RL.loadMainTitleCallback = function () {
}
};
/**
* go pdf print
*/
RL.goPdfPrint = function () {
COMMON.avwScreenMove('pdfPrint.html');
};
abweb/js/sendMessage/sendMessage.js
......@@ -96,11 +96,20 @@ SendMessage.postMessage = function (message, operationId, sendType) {
);
};
/**
* operation selected callback
* @param {Number} operationId
* @param {*} operationName
*/
SendMessage.operationSelectedCallback = function (operationId, operationName) {
$('#operationSelected').attr('data-operation-id', operationId);
$('#operationSelected').text(operationName);
};
/**
* template selected callback
* @param {*} template
*/
SendMessage.templateSelectedCallback = function (template) {
$('#messageContent').val(template);
};
......@@ -129,4 +138,6 @@ SendMessage.init = function () {
I18N.initi18n();
$("label[for='sendTypeGroup']").append(I18N.i18nText('labelSendTypeGroup'));
$("label[for='sendTypeAll']").append(I18N.i18nText('labelSendTypeAll'));
COMMON.closeLoading();
};
abweb/js/setting/settings.js
......@@ -11,9 +11,13 @@ $(document).ready(function () {
COMMON.checkAuth(false);
SETTINGS.initScreen();
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
COMMON.closeLoading();
});
// Process changing password
/**
* Process changing password
* @param {*} e
*/
SETTINGS.dspPwdUpd1_Click = function (e) {
e.preventDefault();
var isOK = true;
......@@ -85,6 +89,10 @@ SETTINGS.dspPwdUpd1_Click = function (e) {
}
};
/**
* password change success
* @param {*} data
*/
SETTINGS.avwCmsApi_passwordChange_success = function (data) {
// OK
var msgError = $('#main-error-message');
......@@ -101,6 +109,13 @@ SETTINGS.avwCmsApi_passwordChange_success = function (data) {
COMMON.displayAlert('msgPwdChangeOK');
}
};
/**
* password change fail
* @param {*} xhr
* @param {*} b
* @param {*} c
*/
SETTINGS.avwCmsApi_passwordChange_fail = function (xhr, b, c) {
/* show error messages */
var msgError = $('#main-error-message');
......
abweb/js/template/template.js
......@@ -31,14 +31,21 @@ TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) {
});
};
/** Template load confirm model */
/**
* Template load confirm model
* @param {*} elmentId
*/
TEMPLATE.loadConfirmModal = function (elmentId) {
$(elmentId).load('../common/html/confirmModal.html', function () {
I18N.initi18n();
});
};
/** Template load operation select */
/**
* Template load operation select
* @param {*} elmentId
* @param {*} selectCallback
*/
TEMPLATE.loadOperationSelect = function (elmentId, selectCallback) {
$(elmentId).load('operationSelect.html', function () {
OperationSelect.init(selectCallback);
......@@ -55,7 +62,11 @@ TEMPLATE.showModalConfirm = function () {
});
};
/** Template load notification content*/
/**
* Template load notification content
* @param {*} elmentId
* @param {*} selectCallback
*/
TEMPLATE.loadNotificationSelect = function (elmentId, selectCallback) {
$(elmentId).load('notificationContent.html', function () {
NotificationSelect.init(selectCallback);
......
abweb/js/topPage/topPage.js
......@@ -8,14 +8,10 @@
var TOP = {};
$(document).ready(function () {
//setting lang info
COMMON.setLangCodeWeb();
//Check if user is logged in
COMMON.checkAuth(false);
//setting msg of html
COMMON.updateLang();
TOP.init();
});
......@@ -23,7 +19,6 @@ $(document).ready(function () {
* show page
*/
TOP.init = function () {
COMMON.showLoading();
HEADER.goToHomePage();
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