Skip to content

C
check
Commit 59ed52da by NGUYEN HOANG SON
Options

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

# Conflicts:
#	abweb/js/operationList/operationList.js
parents 98ffefba 5f63946e
Showing with 360 additions and 180 deletions
abweb/common/css/loading.css 0 → 100644
#loader {
position: fixed;
top: 0;
z-index: 999;
height: 100vh;
width: 100vw;
display: block;
background: rgb(255,255,255,.5);
background-position: center;
background-image: url("../img/loading.gif");
background-repeat: no-repeat;
background-size:200px;
display: none;
}
\ No newline at end of file
abweb/common/css/style.css
...@@ -60,3 +60,9 @@ ul.message-list li.read{ ...@@ -60,3 +60,9 @@ ul.message-list li.read{
grid-template-columns: repeat(2,1fr); grid-template-columns: repeat(2,1fr);
} }
} }
.error {
font-size: 13px;
color: #FF0000;
font-weight: bolder;
}
\ No newline at end of file
abweb/common/html/header.html
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile"> <div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<h6 class="dropdown-header" id="dspLoginId" ></h6> <h6 class="dropdown-header" id="dspLoginId" ></h6>
<a class="dropdown-item " href="accountSetting.html" > <a class="dropdown-item " href="accountSetting.html" >
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting"> <img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="accountSetting">
<span class="lang" style=" color: #6c757d;" lang="account_setting"></span> <span class="lang" style=" color: #6c757d;" lang="accountSetting"></span>
</a> </a>
<a class="dropdown-item " href="login.html" id="btnLogout"> <a class="dropdown-item " href="#" data-toggle="modal" data-target="#confirm-modal" id="btnLogout">
<img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout"> <img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
<span class="lang" style=" color: #6c757d;" lang="dspLogout"></span> <span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
</a> </a>
......
abweb/common/js/common.js
...@@ -32,19 +32,16 @@ COMMON.avwScreenMove = function (url) { ...@@ -32,19 +32,16 @@ COMMON.avwScreenMove = function (url) {
* @param {String} key * @param {String} key
*/ */
COMMON.showLoading = function () { COMMON.showLoading = function () {
$.LoadingOverlay('show', { document.getElementById('loader').style.display = 'block';
image: '../common/img/loading.gif',
});
}; };
/** /**
* close loading * close loading
*/ */
COMMON.closeLoading = function () { COMMON.closeLoading = function () {
setTimeout(function () { setTimeout(function(){
$('#contentFieldOrverlay').show(); document.getElementById('loader').style.display = 'none';
$.LoadingOverlay('hide'); }, 1000);
}, 500);
}; };
/** /**
...@@ -52,17 +49,22 @@ COMMON.closeLoading = function () { ...@@ -52,17 +49,22 @@ COMMON.closeLoading = function () {
* *
* @param {String} msgCode * @param {String} msgCode
*/ */
COMMON.displayAlert = function (msgCode, title) { COMMON.displayAlert = function (msgCode, isError) {
$('#alertMsg').html(I18N.i18nText(msgCode)); $('#msgModel').html(I18N.i18nText(msgCode));
$('.alert-overlay').removeClass('d-none'); $('#confirmYes').hide();
$('.alert-area').removeClass('d-none'); $('#confirmNo').text(I18N.i18nText("confirmation"));
$('#modalTitle').text(I18N.i18nText("error"));
const positionY = $(document).scrollTop() + screen.height / 8; if (isError) {
const height = screen.height / 4; }
$('.alert-overlay').css('height', screen.height); // $('.alert-overlay').removeClass('d-none');
$('.alert-area').css('top', positionY); // $('.alert-area').removeClass('d-none');
$('.alert-area').css('min-height', height);
$('body').css('overflow', 'hidden'); // const positionY = $(document).scrollTop() + screen.height / 8;
// const height = screen.height / 4;
// $('.alert-overlay').css('height', screen.height);
// $('.alert-area').css('top', positionY);
// $('.alert-area').css('min-height', height);
// $('body').css('overflow', 'hidden');
}; };
/** /**
......
abweb/common/js/constant.js
...@@ -18,8 +18,16 @@ CONSTANT.SORT_TYPE = { ...@@ -18,8 +18,16 @@ CONSTANT.SORT_TYPE = {
CONSTANT.PAGE_NAME = { CONSTANT.PAGE_NAME = {
DASHBOARD: 'dashboard', DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList', OPERATION_LIST: 'workList',
DEFAULT: 'index.html', REPORT_LIST: 'reportList',
REPORT_FORM: 'reportForm',
MESSAGE_DETAIL: 'pushMessageDetail',
MESSAGE_LIST: 'pushMessageList',
SEND_MESSAGE: 'sendMessage',
SETTING: 'accountSetting',
PICKUP: 'pickup',
PDF_PRINT: 'pdfPrint',
DEFAULT: 'index',
LOGIN: './login.html', LOGIN: './login.html',
}; };
...@@ -33,13 +41,26 @@ CONSTANT.URL_TREE_NAME = { ...@@ -33,13 +41,26 @@ CONSTANT.URL_TREE_NAME = {
SEND_MESSAGE: 'sendMessage.html', SEND_MESSAGE: 'sendMessage.html',
SETTING: 'accountSetting.html', SETTING: 'accountSetting.html',
PICKUP: 'pickup.html', PICKUP: 'pickup.html',
PICKUP_NEW: 'pickup.html?pickupActive=newReport',
PICKUP_CONTINUOS: 'pickup.html?pickupActive=continousWork',
PICKUP_WARNING: 'pickup.html?pickupActive=warningReport',
PDF_PRINT: 'pdfPrint.html',
}; };
CONSTANT.PICK_UP_TYPE = {
NEW_REPORT : 'newReport',
CONTINOUS_WORK : 'continousWork',
WARNING_REPORT : 'warningReport',
}
CONSTANT.URL_TREE_PASS = { 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], 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], 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], 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], 4: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.SEND_MESSAGE],
5: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
5: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
6: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.PDF_PRINT],
}; };
CONSTANT.PAGE_TAB = { CONSTANT.PAGE_TAB = {
...@@ -78,6 +99,7 @@ CONSTANT.URL = { ...@@ -78,6 +99,7 @@ CONSTANT.URL = {
AUTH_SESSION: 'getSession/checkAuthUser', AUTH_SESSION: 'getSession/checkAuthUser',
OPERATION_VIEW_LOG: 'operationViewLog/saveLog', OPERATION_VIEW_LOG: 'operationViewLog/saveLog',
PASSWORD_CHANGE: 'passwordChangeWeb/', PASSWORD_CHANGE: 'passwordChangeWeb/',
PASSWORD_GET_TOKEN: 'passwordChangeWeb/getToken',
LOGIN: 'webClientLogin/', LOGIN: 'webClientLogin/',
LOGOUT: 'logoutWeb/', LOGOUT: 'logoutWeb/',
DASHBOARD: 'dashboard/', DASHBOARD: 'dashboard/',
......
abweb/common/json/lang/lang-en.json
...@@ -55,14 +55,14 @@ ...@@ -55,14 +55,14 @@
"communication":"Communication", "communication":"Communication",
"workList":"Operation list", "workList":"Operation list",
"profile":"Profile", "profile":"Profile",
"account_setting":"Account setting", "accountSetting":"Account setting",
"newRegistrationTitle":"New Registration", "newRegistrationTitle":"New Registration",
"continousWorkTitle":"Continous Work", "continousWorkTitle":"Continous Work",
"processWorkTitle":"Process work", "processWorkTitle":"Process work",
"reportWarningTitle":"Report With Warnings", "reportWarningTitle":"Report With Warnings",
"workWithWarningsTitle":"Work with warnings", "workWithWarningsTitle":"Work with warnings",
"messageListTitle":"Message List", "pushMessageList":"Message List",
"sendMessageTitle":"Send Message", "sendMessage":"Send Message",
"distanceSupportTitle":"Distance Support", "distanceSupportTitle":"Distance Support",
"chatTitle":"Chat", "chatTitle":"Chat",
"makeDashboardAsHome":"Set dashboard to home screen", "makeDashboardAsHome":"Set dashboard to home screen",
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
"confirmYes":"Yes", "confirmYes":"Yes",
"confirmNo":"No", "confirmNo":"No",
"messageListEmpty":"No Messages", "messageListEmpty":"No Messages",
"messageDetail":"Message Details", "pushMessageDetail":"Message Details",
"operationName":"Operation Name", "operationName":"Operation Name",
"sendDate":"Send Date", "sendDate":"Send Date",
"sender":"Sender", "sender":"Sender",
...@@ -116,5 +116,6 @@ ...@@ -116,5 +116,6 @@
"categoryAll":"All", "categoryAll":"All",
"reportForm": "Report", "reportForm": "Report",
"periodicInspectionPeriod": "Periodic Inspection Period", "periodicInspectionPeriod": "Periodic Inspection Period",
"msgSendPushMessageSuccess":"we sent a push message" "msgSendPushMessageSuccess":"we sent a push message",
"error": "Error"
} }
\ No newline at end of file
abweb/common/json/lang/lang-ja.json
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
"communication":"コミュニケーション", "communication":"コミュニケーション",
"workList":"作業一覧", "workList":"作業一覧",
"profile":"プロフィール", "profile":"プロフィール",
"account_setting":"アカウント設定", "accountSetting":"アカウント設定",
"newRegistrationTitle":"新規報告", "newRegistrationTitle":"新規報告",
"continousWorkTitle":"工程管理", "continousWorkTitle":"工程管理",
"processWorkTitle":"工程作業", "processWorkTitle":"工程作業",
"reportWarningTitle":"警告を含む報告", "reportWarningTitle":"警告を含む報告",
"workWithWarningsTitle":"警告を含む作業", "workWithWarningsTitle":"警告を含む作業",
"messageListTitle":"メッセージ一覧", "pushMessageList":"メッセージ一覧",
"sendMessageTitle":"メッセージ送信", "sendMessage":"メッセージ送信",
"distanceSupportTitle":"遠隔支援", "distanceSupportTitle":"遠隔支援",
"chatTitle":"チャット", "chatTitle":"チャット",
"makeDashboardAsHome":"ダッシュボードをホーム画面にする", "makeDashboardAsHome":"ダッシュボードをホーム画面にする",
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
"confirmYes":"はい", "confirmYes":"はい",
"confirmNo":"いいえ", "confirmNo":"いいえ",
"messageListEmpty":"メッセージがありません。", "messageListEmpty":"メッセージがありません。",
"messageDetail":"メッセージ詳細", "pushMessageDetail":"メッセージ詳細",
"operationName":"作業名", "operationName":"作業名",
"sendDate":"送信日時", "sendDate":"送信日時",
"sender":"送信者", "sender":"送信者",
...@@ -114,5 +114,6 @@ ...@@ -114,5 +114,6 @@
"categoryAll":"すべて", "categoryAll":"すべて",
"reportForm": "報告", "reportForm": "報告",
"periodicInspectionPeriod": "定期点検期間", "periodicInspectionPeriod": "定期点検期間",
"msgSendPushMessageSuccess":"プッシュメッセージ送信しました。" "msgSendPushMessageSuccess":"プッシュメッセージ送信しました。",
"error": "エラー"
} }
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
"communication":"커뮤니케이션", "communication":"커뮤니케이션",
"workList":"작업 일람", "workList":"작업 일람",
"profile":"프로필", "profile":"프로필",
"account_setting":"계정 설정", "accountSetting":"계정 설정",
"newRegistrationTitle":"신규 등록", "newRegistrationTitle":"신규 등록",
"continousWorkTitle":"정기점검", "continousWorkTitle":"정기점검",
"processWorkTitle":"공정관리", "processWorkTitle":"공정관리",
"reportWarningTitle":"경고를 포함한 보고", "reportWarningTitle":"경고를 포함한 보고",
"workWithWarningsTitle":"경고를 포함한 작업", "workWithWarningsTitle":"경고를 포함한 작업",
"messageListTitle":"메시지 일람", "pushMessageList":"메시지 일람",
"sendMessageTitle":"메시지 송신", "sendMessage":"메시지 송신",
"distanceSupportTitle":"원격 지원", "distanceSupportTitle":"원격 지원",
"chatTitle":"채팅", "chatTitle":"채팅",
"makeDashboardAsHome":"대시보드를 홈화면으로 지정", "makeDashboardAsHome":"대시보드를 홈화면으로 지정",
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
"confirmYes":"예", "confirmYes":"예",
"confirmNo":"아니오", "confirmNo":"아니오",
"messageListEmpty":"표시할 메시지가 없습니다.", "messageListEmpty":"표시할 메시지가 없습니다.",
"messageDetail":"메시지 상세", "pushMessageDetail":"메시지 상세",
"operationName":"작업명", "operationName":"작업명",
"sendDate":"송신일시", "sendDate":"송신일시",
"sender":"송신자", "sender":"송신자",
...@@ -113,5 +113,6 @@ ...@@ -113,5 +113,6 @@
"categoryAll":"All", "categoryAll":"All",
"reportForm": "보고서", "reportForm": "보고서",
"periodicInspectionPeriod": "정기점검기간", "periodicInspectionPeriod": "정기점검기간",
"msgSendPushMessageSuccess":"푸시메시지를 보냈습니다." "msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
"error": "에러"
} }
\ No newline at end of file
abweb/html/accountSetting.html
...@@ -4,12 +4,13 @@ ...@@ -4,12 +4,13 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="account_setting"></title> <title class="lang" lang="accountSetting"></title>
<!-- favicons --> <!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon"> <link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
<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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.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="../common/js/constant.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
...@@ -28,22 +30,18 @@ ...@@ -28,22 +30,18 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- account setting --> <!-- account setting -->
<div id="includedMainTitle"></div>
<main id="main"> <main id="main">
<div class="container-wrap"> <div class="container-wrap">
<div id="main-ttl">
<!-- title -->
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="account_setting">アカウント設定</h1>
<!-- content --> <!-- content -->
<div class="row"> <div class="row">
<div class="col-md-6 col-12 mb-4"> <div class="col-md-6 col-12 mb-4">
<div class="card p-4"> <div class="card p-4">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="accountInformation">アカウント情報</h2> <h2 class="fs-10 font-weight-bold mb-3 lang" lang="accountSetting"></h2>
<table> <table>
<colgroup> <colgroup>
<col span="1" class="w-120px"> <col span="1" class="w-120px">
...@@ -88,7 +86,6 @@ ...@@ -88,7 +86,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</main> </main>
<!-- alert --> <!-- alert -->
...@@ -97,12 +94,11 @@ ...@@ -97,12 +94,11 @@
<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>
<input type="hidden" id="getToken">
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<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
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- dashboard --> <!-- dashboard -->
...@@ -68,6 +69,5 @@ ...@@ -68,6 +69,5 @@
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<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/index.html
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -21,19 +22,17 @@ ...@@ -21,19 +22,17 @@
<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="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../js/template/template.js?__UPDATEID__"></script>
<script src="../js/operationList/operationList.js?__UPDATEID__"></script> <script src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script src="../js/dashboardSetting/dashboardSetting.js?__UPDATEID__"></script> <script src="../js/dashboardSetting/dashboardSetting.js?__UPDATEID__"></script>
<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/topPage/topPage.js?__UPDATEID__"></script> <script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script> <script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- task list --> <!-- task list -->
...@@ -132,20 +131,6 @@ ...@@ -132,20 +131,6 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<!--alert-->
<div class="alert-overlay d-none"></div>
<div class="alert-area d-none">
<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>
<!--loading-->
<div id="check_loading" style="display:none; position: relative; overflow:hidden;">
<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/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/login.html
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<link rel="stylesheet" type="text/css" href="../css/login/login.css"> <link rel="stylesheet" type="text/css" href="../css/login/login.css">
...@@ -25,9 +26,10 @@ ...@@ -25,9 +26,10 @@
<script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/jquery/jquery-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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/validation.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/validation.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/login/login.js?__UPDATEID__"></script>
...@@ -42,6 +44,7 @@ ...@@ -42,6 +44,7 @@
</head> </head>
<body> <body>
<div id="loader"></div>
<form class="form-login card"> <form class="form-login card">
<img class="mb-4 w-100 text-center" src="../common/img/logo.svg" alt="" height="60"> <img class="mb-4 w-100 text-center" src="../common/img/logo.svg" alt="" height="60">
<div class="form-group mb-2"> <div class="form-group mb-2">
......
abweb/html/pdfPrint.html
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<link href="../img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -18,13 +19,16 @@ ...@@ -18,13 +19,16 @@
<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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <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="../js/template/template.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
PP.init(); PP.init();
...@@ -33,7 +37,7 @@ ...@@ -33,7 +37,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
...@@ -54,13 +58,12 @@ ...@@ -54,13 +58,12 @@
</div> </div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ --> <!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrint" ></div> <div class="container-wrap mb-5" id="pdfPrintDiv" ></div>
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<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/pickup.html
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></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="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../js/pickup/pickup.js"></script> <script type="text/javascript" src="../js/pickup/pickup.js?__UPDATEID__"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
...@@ -41,7 +42,7 @@ ...@@ -41,7 +42,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- pickup --> <!-- pickup -->
<main> <main>
...@@ -140,7 +141,6 @@ ...@@ -140,7 +141,6 @@
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<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/pushMessageDetail.html
...@@ -4,12 +4,13 @@ ...@@ -4,12 +4,13 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="messageDetail"></title> <title class="lang" lang="pushMessageDetail"></title>
<!-- favicons --> <!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon"> <link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -17,11 +18,11 @@ ...@@ -17,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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.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 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>
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- message detail --> <!-- message detail -->
...@@ -73,7 +74,6 @@ ...@@ -73,7 +74,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/pushMessageList.html
...@@ -4,12 +4,13 @@ ...@@ -4,12 +4,13 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="messageListTitle"></title> <title class="lang" lang="pushMessageList"></title>
<!-- favicons --> <!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon"> <link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -17,9 +18,9 @@ ...@@ -17,9 +18,9 @@
<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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/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>
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- message list --> <!-- message list -->
<main> <main>
...@@ -54,6 +55,5 @@ ...@@ -54,6 +55,5 @@
</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
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -17,47 +18,23 @@ ...@@ -17,47 +18,23 @@
<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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/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 src="../common/js/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 src="../js/reportForm/reportForm.js?__UPDATEID__"></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;"> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- report list --> <!-- report list -->
<main> <div id="includedMainTitle"></div>
<div class="container-wrap">
<div id="main-ttl">
<!-- breadcrumb -->
<nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0">
<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>
<li class="breadcrumb-item active" aria-current="page"><span>報告一覧</span></li>
<li class="breadcrumb-item active" aria-current="page"><span>報告</span></li>
</ol>
</nav>
<!-- title -->
<div class="d-flex align-items-center">
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto" lang="reportForm"></h1>
<div style="display: none;">
<div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>
<div><span id="inspectDate"></span></div>
</div>
<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">
</div>
</div>
</div>
</div>
</main>
<div class="mb-5" id="report-form"></div> <div class="mb-5" id="report-form"></div>
...@@ -65,6 +42,5 @@ ...@@ -65,6 +42,5 @@
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<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
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -17,11 +18,12 @@ ...@@ -17,11 +18,12 @@
<script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/jquery/jquery-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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/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 src="../common/js/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>
...@@ -34,7 +36,7 @@ ...@@ -34,7 +36,7 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
...@@ -46,7 +48,6 @@ ...@@ -46,7 +48,6 @@
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<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/sendMessage.html
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title class="lang" lang="sendMessageTitle"></title> <title class="lang" lang="sendMessage"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons --> <!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon"> <link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css --> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css"> <link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css --> <!-- vender css -->
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
<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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/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 type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
...@@ -25,7 +27,6 @@ ...@@ -25,7 +27,6 @@
<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 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="loader"></div>
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- send message --> <!-- send message -->
<main> <main>
...@@ -92,7 +93,6 @@ ...@@ -92,7 +93,6 @@
<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
...@@ -13,8 +13,8 @@ DASHBOARD.pickupItems = [ ...@@ -13,8 +13,8 @@ DASHBOARD.pickupItems = [
/** comunication dashboard configuration */ /** comunication dashboard configuration */
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: 'pushMessageList' },
{ 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: 'sendMessage' },
]; ];
/** Default dashboard setting data */ /** Default dashboard setting data */
...@@ -128,6 +128,7 @@ DASHBOARD.init = function () { ...@@ -128,6 +128,7 @@ DASHBOARD.init = function () {
COMMON.checkAuth(false); COMMON.checkAuth(false);
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
sessionStorage.removeItem("operationId");
DASHBOARD.loadCommon(); DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) { DASHBOARD.getDashboardData(function (dataDashboard) {
...@@ -141,7 +142,7 @@ DASHBOARD.init = function () { ...@@ -141,7 +142,7 @@ DASHBOARD.init = function () {
}; };
/** load common data */ /** load common data */
DASHBOARD.loadCommon = function () { DASHBOARD.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadDashboardSetting('#includedDashboardSetting', DASHBOARD.changeSettingCallback); TEMPLATE.loadDashboardSetting('#includedDashboardSetting', DASHBOARD.changeSettingCallback);
TEMPLATE.loadConfirmModal('#includedConfirmModal'); TEMPLATE.loadConfirmModal('#includedConfirmModal');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'dashboard', null, DASHBOARD.loadMainTitleCallback); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'dashboard', null, DASHBOARD.loadMainTitleCallback);
......
abweb/js/operationList/operationList.js
...@@ -22,11 +22,12 @@ OL.operationGroupMasterId; ...@@ -22,11 +22,12 @@ OL.operationGroupMasterId;
*/ */
OL.init = function () { OL.init = function () {
console.log('OperationList start'); console.log('OperationList start');
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
sessionStorage.removeItem("operationId");
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', null, null);
TEMPLATE.loadConfirmModal('#includedConfirmModal'); TEMPLATE.loadConfirmModal('#includedConfirmModal');
//get all data of operation list scene //get all data of operation list scene
OL.getAllDataWeb(sessionStorage.OL_searchKeyWord, sessionStorage.OL_sortIndex, sessionStorage.OL_searchStartDate, sessionStorage.OL_searchEndDate, sessionStorage.OL_operationGroupMasterId); OL.getAllDataWeb(sessionStorage.OL_searchKeyWord, sessionStorage.OL_sortIndex, sessionStorage.OL_searchStartDate, sessionStorage.OL_searchEndDate, sessionStorage.OL_operationGroupMasterId);
...@@ -316,6 +317,7 @@ OL.createCategoryList = function () { ...@@ -316,6 +317,7 @@ OL.createCategoryList = function () {
//create category(operationGroupMaster) structure //create category(operationGroupMaster) structure
for (let i = 0; i < OL.operationGroupMaster.length; i++) { for (let i = 0; i < OL.operationGroupMaster.length; i++) {
const item = OL.operationGroupMaster[i]; const item = OL.operationGroupMaster[i];
// console.log(item);
let inputLabel = $('<label>'); let inputLabel = $('<label>');
let inputRadio = $('<input type="radio" name="category">'); let inputRadio = $('<input type="radio" name="category">');
inputRadio.val(item.operationGroupMasterId); inputRadio.val(item.operationGroupMasterId);
...@@ -506,11 +508,11 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe ...@@ -506,11 +508,11 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe
//save operation logs. needed for sorting //save operation logs. needed for sorting
OL.saveOperationReadingLog(operationId, operationType, reportType); OL.saveOperationReadingLog(operationId, operationType, reportType);
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
sessionStorage.setItem("operationId", operationId);
if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) { if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) {
sessionStorage.OL_operationId = operationId;
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove('reportList.html');
} else { } else {
const url = 'reportForm.html?operationId=' + operationId; const url = 'reportForm.html?operationId=' + operationId + "&addReport=" + enableAddReport;
COMMON.avwScreenMove(url); COMMON.avwScreenMove(url);
} }
}; };
......
abweb/js/pdfPrint/pdfPrint.js
...@@ -25,26 +25,34 @@ PP.init = function () { ...@@ -25,26 +25,34 @@ PP.init = function () {
* load common * load common
*/ */
PP.loadCommon = function () { PP.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () { TEMPLATE.loadHeader('#includedHeader');
I18N.initi18n(); TEMPLATE.loadConfirmModal('#includedConfirmModal');
HEADER.init(); let navs = [
}); {
$('#includedConfirmModal').load('../common/html/confirmModal.html', function () { titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
I18N.initi18n(); href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
}); },
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.PDF_PRINT,
}
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.PDF_PRINT, navs, null);
}; };
/** /**
* init pdf list * init pdf list
*/ */
PP.initPdfList = function () { PP.initPdfList = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.getItem("operationId")) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId; params.operationId = sessionStorage.getItem("operationId");
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.QUICK_REPORT_PRINT; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.QUICK_REPORT_PRINT;
$('#pdfPrint').load(url, params); $('#pdfPrintDiv').load(url, params);
} else { } else {
COMMON.displayAlert('error'); COMMON.displayAlert('error');
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove('reportList.html');
......
abweb/js/pickup/pickup.js
...@@ -134,18 +134,19 @@ PICKUP.getReportWithWarningsListData = function (callback) { ...@@ -134,18 +134,19 @@ PICKUP.getReportWithWarningsListData = function (callback) {
PICKUP.init = function () { PICKUP.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
console.log('PICKUP.init'); console.log('PICKUP.init');
sessionStorage.removeItem("pickUpType");
// sessionStorage.pickUpType = null;
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal'); TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [ navs = [
{ {
titleLang: 'dashboard', titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: 'dashboard.html', href: CONSTANT.URL_TREE_NAME.DASHBOARD,
}, },
{ {
titleLang: 'pickup', titleLang: CONSTANT.PAGE_NAME.PICKUP,
}, },
]; ];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null);
...@@ -153,6 +154,8 @@ PICKUP.init = function () { ...@@ -153,6 +154,8 @@ PICKUP.init = function () {
PICKUP.settingPickup(); PICKUP.settingPickup();
COMMON.closeLoading(); COMMON.closeLoading();
}; };
/** /**
* Setting pickup data * Setting pickup data
*/ */
...@@ -747,6 +750,7 @@ PICKUP.getInspectDate = function (dateString) { ...@@ -747,6 +750,7 @@ PICKUP.getInspectDate = function (dateString) {
*/ */
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
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.NEW_REPORT);
const url = 'reportForm.html?operationId=' + operationId; const url = 'reportForm.html?operationId=' + operationId;
COMMON.avwScreenMove(url); COMMON.avwScreenMove(url);
}; };
...@@ -760,6 +764,7 @@ PICKUP.sendReportFormFromNewReport = function (operationId) { ...@@ -760,6 +764,7 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
*/ */
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
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK);
const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo; const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo;
COMMON.avwScreenMove(url); COMMON.avwScreenMove(url);
}; };
...@@ -775,6 +780,7 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces ...@@ -775,6 +780,7 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
*/ */
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
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.WARNING_REPORT);
let url = 'reportForm.html?operationId=' + operationId; let url = 'reportForm.html?operationId=' + operationId;
switch (reportType) { switch (reportType) {
case PICKUP.REPORT_TYPE.REPORTONLY: case PICKUP.REPORT_TYPE.REPORTONLY:
......
abweb/js/pushMessageDetail/pushMessageDetail.js
...@@ -25,7 +25,7 @@ PushMessageDetail.init = function () { ...@@ -25,7 +25,7 @@ PushMessageDetail.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
//load common html //load common html
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
......
abweb/js/pushMessageList/pushMessageList.js
...@@ -11,7 +11,7 @@ PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Client ...@@ -11,7 +11,7 @@ PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Client
PushMessageList.init = function () { PushMessageList.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
...@@ -21,7 +21,7 @@ PushMessageList.init = function () { ...@@ -21,7 +21,7 @@ PushMessageList.init = function () {
titleLang: 'messageListTitle', titleLang: 'messageListTitle',
}, },
]; ];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageListTitle', navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pushMessageList', navs, null);
PushMessageList.getMessageList(function (messageList) { PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList); PushMessageList.generateMessageListHtml(messageList.pushMessageList);
}); });
......
abweb/js/reportForm/reportForm.js
...@@ -12,12 +12,105 @@ RF.init = function () { ...@@ -12,12 +12,105 @@ RF.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader'); RF.loadCommon();
TEMPLATE.loadConfirmModal('#includedConfirmModal');
RF.initFormView(); RF.initFormView();
}; };
/** /**
* load common
*/
RF.loadCommon = function () {
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
RF.initBreadcrumb();
};
/**
* create breadcrumb menu on ReportForm
*/
RF.initBreadcrumb = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_CONTINUOS,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
},
]
} else if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_WARNING,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
},
]
} else {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_NEW,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
},
]
}
} else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
const urlParam = COMMON.getUrlParameter();
let addReportFlg = urlParam["addReport"];
if (addReportFlg == "1") {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
},
]
} else {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
},
]
}
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, null);
}
/**
* iinit form view * iinit form view
*/ */
RF.initFormView = function () { RF.initFormView = function () {
...@@ -44,8 +137,7 @@ RF.initFormView = function () { ...@@ -44,8 +137,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();
$('#contentFieldOrverlay').show(); COMMON.closeLoading();
//COMMON.closeLoading();
}); });
} else { } else {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
......
abweb/js/reportList/reportList.js
...@@ -16,25 +16,48 @@ RL.init = function () { ...@@ -16,25 +16,48 @@ RL.init = function () {
RL.checkQuickReport(); RL.checkQuickReport();
RL.loadCommon(); RL.loadCommon();
RL.initTaskReportList(); RL.initTaskReportList();
COMMON.closeLoading();
}; };
/** /**
* load common * load common
*/ */
RL.loadCommon = function () { RL.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal'); TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [ RL.initBreadcrumb();
};
RL.initBreadcrumb = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
navs = [
{ {
titleLang: 'dashboard', titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: 'dashboard.html', href: CONSTANT.URL_TREE_NAME.DASHBOARD,
}, },
{ {
titleLang: 'pickup', titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_NEW,
}, },
]; {
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'reportList', navs, RL.loadMainTitleCallback); titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
}; },
]
} else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
},
]
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_LIST, navs, RL.loadMainTitleCallback);
}
RL.isQuickReport; RL.isQuickReport;
...@@ -42,11 +65,10 @@ RL.isQuickReport; ...@@ -42,11 +65,10 @@ RL.isQuickReport;
* check quick report * check quick report
*/ */
RL.checkQuickReport = function () { RL.checkQuickReport = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.getItem("operationId")) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId; params.operationId = sessionStorage.getItem("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; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
COMMON.cmsAjax( COMMON.cmsAjax(
url, url,
...@@ -70,11 +92,10 @@ RL.checkQuickReport = function () { ...@@ -70,11 +92,10 @@ RL.checkQuickReport = function () {
* init task report list * init task report list
*/ */
RL.initTaskReportList = function () { RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.getItem("operationId")) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId; params.operationId = sessionStorage.getItem("operationId");
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
$('#reportList').load(url, params, function () { $('#reportList').load(url, params, function () {
COMMON.closeLoading(); COMMON.closeLoading();
......
abweb/js/sendMessage/sendMessage.js
...@@ -125,7 +125,7 @@ SendMessage.templateSelectedCallback = function (template) { ...@@ -125,7 +125,7 @@ SendMessage.templateSelectedCallback = function (template) {
SendMessage.init = function () { SendMessage.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
...@@ -135,7 +135,7 @@ SendMessage.init = function () { ...@@ -135,7 +135,7 @@ SendMessage.init = function () {
titleLang: 'sendMessageTitle', titleLang: 'sendMessageTitle',
}, },
]; ];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessageTitle', navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessage', navs, null);
TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback); TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback);
TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback); TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback);
$('#messageContent').attr('maxlength', SendMessage.contentMaxLength); $('#messageContent').attr('maxlength', SendMessage.contentMaxLength);
......
abweb/js/setting/settings.js
...@@ -9,16 +9,38 @@ var SETTINGS = {}; ...@@ -9,16 +9,38 @@ var SETTINGS = {};
$(document).ready(function () { $(document).ready(function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
SETTINGS.getToken();
SETTINGS.initScreen(); SETTINGS.initScreen();
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click); $('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
COMMON.closeLoading(); COMMON.closeLoading();
}); });
/** /**
* Get CSRF token from CMS server
*/
SETTINGS.getToken = function () {
var params = {
sid: ClientData.userInfo_sid(),
};
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_GET_TOKEN;
COMMON.cmsAjax(url, params, false,
function(data) {
$('#getToken').val(data);
},
function(data) {
if (data.errorMessage) {
COMMON.displayAlert(data.errorMessage);
} else {
COMMON.displayAlert('msgPwdChangeOK');
}
});
};
/**
* Process changing password * Process changing password
* @param {*} e * @param {*} e
*/ */
SETTINGS.dspPwdUpd1_Click = function (e) { SETTINGS.dspPwdUpd1_Click = function (e) {
// const tokenVal = $('#tokenVal').val();
e.preventDefault(); e.preventDefault();
var isOK = true; var isOK = true;
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
...@@ -74,14 +96,20 @@ SETTINGS.dspPwdUpd1_Click = function (e) { ...@@ -74,14 +96,20 @@ SETTINGS.dspPwdUpd1_Click = function (e) {
// Do changing password // Do changing password
if (isOK) { if (isOK) {
var getToken = $("#getToken").val();
var params = { var params = {
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
loginId: ClientData.userInfo_loginId_session(), loginId: ClientData.userInfo_loginId_session(),
password: SETTINGS.getCurrentPassword(), password: SETTINGS.getCurrentPassword(),
newPassword: SETTINGS.getNewPassword(), newPassword: SETTINGS.getNewPassword(),
language: I18N.getCurrentLanguage(), language: I18N.getCurrentLanguage(),
token: getToken,
appId: 4, appId: 4,
}; };
// if (SETTINGS.TOKEN_VALUE != getToken) {
// COMMON.displayAlert("error");
// return;
// }
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
COMMON.cmsAjax(url, params, false, SETTINGS.avwCmsApi_passwordChange_success, SETTINGS.avwCmsApi_passwordChange_fail); COMMON.cmsAjax(url, params, false, SETTINGS.avwCmsApi_passwordChange_success, SETTINGS.avwCmsApi_passwordChange_fail);
} else { } else {
...@@ -148,7 +176,18 @@ SETTINGS.getNewPasswordRe = function () { ...@@ -148,7 +176,18 @@ SETTINGS.getNewPasswordRe = function () {
// Initalize screen // Initalize screen
SETTINGS.initScreen = function () { SETTINGS.initScreen = function () {
TEMPLATE.loadHearder('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
titleLang: 'txtTooltipBack',
href: 'javascript:history.back();',
},
{
titleLang: 'accountSetting',
},
]
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'accountSetting', navs, null);
// Login ID // Login ID
$('#txtLoginId').text(ClientData.userInfo_loginId_session()); $('#txtLoginId').text(ClientData.userInfo_loginId_session());
// Account Path // Account Path
......
abweb/js/template/template.js
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
var TEMPLATE = {}; var TEMPLATE = {};
/** template load header */ /** template load header */
TEMPLATE.loadHearder = function (elmentId) { TEMPLATE.loadHeader = function (elmentId) {
// COMMON.showLoading(); COMMON.showLoading();
$(elmentId).load('../common/html/header.html', function () { $(elmentId).load('../common/html/header.html', function () {
$('#iconHomeDashboard').removeClass('active'); $('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active'); $('#iconHomeWorkList').removeClass('active');
if (sessionStorage.activeHomePage == CONSTANT.PAGE_NAME.OPERATION_LIST) { if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.OPERATION_LIST) {
$('#iconHomeWorkList').addClass('active'); $('#iconHomeWorkList').addClass('active');
} else { } else {
$('#iconHomeDashboard').addClass('active'); $('#iconHomeDashboard').addClass('active');
...@@ -38,6 +38,7 @@ TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) { ...@@ -38,6 +38,7 @@ TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) {
*/ */
TEMPLATE.loadConfirmModal = function (elmentId) { TEMPLATE.loadConfirmModal = function (elmentId) {
$(elmentId).load('../common/html/confirmModal.html', function () { $(elmentId).load('../common/html/confirmModal.html', function () {
HEADER.initLogout();
I18N.initi18n(); I18N.initi18n();
}); });
}; };
...@@ -86,6 +87,7 @@ TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, navs, completeCallba ...@@ -86,6 +87,7 @@ TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, navs, completeCallba
if (navs) { if (navs) {
titleHtmlPath = '../common/html/mainNavTitle.html'; titleHtmlPath = '../common/html/mainNavTitle.html';
} }
$(elmentId).load(titleHtmlPath, function (data) { $(elmentId).load(titleHtmlPath, function (data) {
$(elmentId).replaceWith(data); $(elmentId).replaceWith(data);
if (titleLang) { if (titleLang) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment