Skip to content

C
check
Commit 5f63946e by Takumi Imai
Options

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

Feature/1.0 check web dev kdh 2

See merge request !56
parents d434b3ce e38b782c
Showing with 589 additions and 382 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{
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 @@
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<h6 class="dropdown-header" id="dspLoginId" ></h6>
<a class="dropdown-item " href="accountSetting.html" >
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
<span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="accountSetting">
<span class="lang" style=" color: #6c757d;" lang="accountSetting"></span>
</a>
<a class="dropdown-item " href="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">
<span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
</a>
......
abweb/common/js/common.js
......@@ -32,19 +32,16 @@ COMMON.avwScreenMove = function (url) {
* @param {String} key
*/
COMMON.showLoading = function () {
$.LoadingOverlay('show', {
image: '../common/img/loading.gif',
});
document.getElementById('loader').style.display = 'block';
};
/**
* close loading
*/
COMMON.closeLoading = function () {
setTimeout(function () {
$('#contentFieldOrverlay').show();
$.LoadingOverlay('hide');
}, 500);
setTimeout(function(){
document.getElementById('loader').style.display = 'none';
}, 1000);
};
/**
......@@ -52,17 +49,22 @@ COMMON.closeLoading = function () {
*
* @param {String} msgCode
*/
COMMON.displayAlert = function (msgCode, title) {
$('#alertMsg').html(I18N.i18nText(msgCode));
$('.alert-overlay').removeClass('d-none');
$('.alert-area').removeClass('d-none');
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');
COMMON.displayAlert = function (msgCode, isError) {
$('#msgModel').html(I18N.i18nText(msgCode));
$('#confirmYes').hide();
$('#confirmNo').text(I18N.i18nText("confirmation"));
$('#modalTitle').text(I18N.i18nText("error"));
if (isError) {
}
// $('.alert-overlay').removeClass('d-none');
// $('.alert-area').removeClass('d-none');
// 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 = {
CONSTANT.PAGE_NAME = {
DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList',
DEFAULT: 'index.html',
OPERATION_LIST: 'workList',
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',
};
......@@ -33,13 +41,26 @@ CONSTANT.URL_TREE_NAME = {
SEND_MESSAGE: 'sendMessage.html',
SETTING: 'accountSetting.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 = {
1: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
2: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_FORM],
3: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.MESSAGE_LIST, CONSTANT.URL_TREE_NAME.MESSAGE_DETAIL],
4: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.SEND_MESSAGE],
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 = {
......@@ -78,6 +99,7 @@ CONSTANT.URL = {
AUTH_SESSION: 'getSession/checkAuthUser',
OPERATION_VIEW_LOG: 'operationViewLog/saveLog',
PASSWORD_CHANGE: 'passwordChangeWeb/',
PASSWORD_GET_TOKEN: 'passwordChangeWeb/getToken',
LOGIN: 'webClientLogin/',
LOGOUT: 'logoutWeb/',
DASHBOARD: 'dashboard/',
......
abweb/common/json/lang/lang-en.json
......@@ -55,14 +55,14 @@
"communication":"Communication",
"workList":"Operation list",
"profile":"Profile",
"account_setting":"Account setting",
"accountSetting":"Account setting",
"newRegistrationTitle":"New Registration",
"continousWorkTitle":"Continous Work",
"processWorkTitle":"Process work",
"reportWarningTitle":"Report With Warnings",
"workWithWarningsTitle":"Work with warnings",
"messageListTitle":"Message List",
"sendMessageTitle":"Send Message",
"pushMessageList":"Message List",
"sendMessage":"Send Message",
"distanceSupportTitle":"Distance Support",
"chatTitle":"Chat",
"makeDashboardAsHome":"Set dashboard to home screen",
......@@ -77,7 +77,7 @@
"confirmYes":"Yes",
"confirmNo":"No",
"messageListEmpty":"No Messages",
"messageDetail":"Message Details",
"pushMessageDetail":"Message Details",
"operationName":"Operation Name",
"sendDate":"Send Date",
"sender":"Sender",
......@@ -116,5 +116,6 @@
"categoryAll":"All",
"reportForm": "Report",
"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 @@
"communication":"コミュニケーション",
"workList":"作業一覧",
"profile":"プロフィール",
"account_setting":"アカウント設定",
"accountSetting":"アカウント設定",
"newRegistrationTitle":"新規報告",
"continousWorkTitle":"工程管理",
"processWorkTitle":"工程作業",
"reportWarningTitle":"警告を含む報告",
"workWithWarningsTitle":"警告を含む作業",
"messageListTitle":"メッセージ一覧",
"sendMessageTitle":"メッセージ送信",
"pushMessageList":"メッセージ一覧",
"sendMessage":"メッセージ送信",
"distanceSupportTitle":"遠隔支援",
"chatTitle":"チャット",
"makeDashboardAsHome":"ダッシュボードをホーム画面にする",
......@@ -75,7 +75,7 @@
"confirmYes":"はい",
"confirmNo":"いいえ",
"messageListEmpty":"メッセージがありません。",
"messageDetail":"メッセージ詳細",
"pushMessageDetail":"メッセージ詳細",
"operationName":"作業名",
"sendDate":"送信日時",
"sender":"送信者",
......@@ -114,5 +114,6 @@
"categoryAll":"すべて",
"reportForm": "報告",
"periodicInspectionPeriod": "定期点検期間",
"msgSendPushMessageSuccess":"プッシュメッセージ送信しました。"
"msgSendPushMessageSuccess":"プッシュメッセージ送信しました。",
"error": "エラー"
}
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
......@@ -52,14 +52,14 @@
"communication":"커뮤니케이션",
"workList":"작업 일람",
"profile":"프로필",
"account_setting":"계정 설정",
"accountSetting":"계정 설정",
"newRegistrationTitle":"신규 등록",
"continousWorkTitle":"정기점검",
"processWorkTitle":"공정관리",
"reportWarningTitle":"경고를 포함한 보고",
"workWithWarningsTitle":"경고를 포함한 작업",
"messageListTitle":"메시지 일람",
"sendMessageTitle":"메시지 송신",
"pushMessageList":"메시지 일람",
"sendMessage":"메시지 송신",
"distanceSupportTitle":"원격 지원",
"chatTitle":"채팅",
"makeDashboardAsHome":"대시보드를 홈화면으로 지정",
......@@ -74,7 +74,7 @@
"confirmYes":"예",
"confirmNo":"아니오",
"messageListEmpty":"표시할 메시지가 없습니다.",
"messageDetail":"메시지 상세",
"pushMessageDetail":"메시지 상세",
"operationName":"작업명",
"sendDate":"송신일시",
"sender":"송신자",
......@@ -113,5 +113,6 @@
"categoryAll":"All",
"reportForm": "보고서",
"periodicInspectionPeriod": "정기점검기간",
"msgSendPushMessageSuccess":"푸시메시지를 보냈습니다."
"msgSendPushMessageSuccess":"푸시메시지를 보냈습니다.",
"error": "에러"
}
\ No newline at end of file
abweb/html/dashboard.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<!-- vender css -->
......@@ -24,7 +25,7 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
......@@ -37,37 +38,36 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<!-- dashboard -->
<main>
<div class="container-wrap">
<div id="includedMainTitle"></div>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="pickupHeader" lang="pickup"></h2>
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- dashboard -->
<main>
<div class="container-wrap">
<div id="includedMainTitle"></div>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="pickupHeader" lang="pickup"></h2>
<!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" >
</ul>
<!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" >
</ul>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" lang="communication"></h2>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" lang="communication"></h2>
<!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id="communicationItems">
</ul>
</div>
</main>
<!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id="communicationItems">
</ul>
</div>
</main>
<!-- dashboard setting model -->
<div id="includedDashboardSetting"></div>
<!-- dashboard setting model -->
<div id="includedDashboardSetting"></div>
<!-- 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>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/login.html
......@@ -15,6 +15,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<link rel="stylesheet" type="text/css" href="../css/login/login.css">
......@@ -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-ui.min.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/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="../js/login/login.js?__UPDATEID__"></script>
......@@ -42,6 +44,7 @@
</head>
<body>
<div id="loader"></div>
<form class="form-login card">
<img class="mb-4 w-100 text-center" src="../common/img/logo.svg" alt="" height="60">
<div class="form-group mb-2">
......@@ -51,7 +54,7 @@
<input type="text" class="form-control lang" lang="txtLoginId" placeholder="txtLoginId" id="txtAccId" maxlength="54" >
</div>
<div class="form-group mb-2">
<input type="password" class="form-control lang" lang="txtLoginPwd" placeholder="txtLoginPwd" id="txtPassword" >
<input type="password" class="form-control lang" lang="txtLoginPwd" placeholder="txtLoginPwd" id="txtPassword" >
</div>
<div class="form-group mb-2">
<select class="form-control" id="languageSelect">
......
abweb/html/pdfPrint.html
......@@ -10,6 +10,7 @@
<link href="../img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<!-- vender css -->
......@@ -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-ui.min.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/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 src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
PP.init();
......@@ -33,34 +37,33 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- title -->
<div id="main-ttl">
<div class="container-wrap">
<!-- 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"><a href="report-list.html" class="text-decoration-none text-underline">報告一覧</a></li>
<li class="breadcrumb-item active" aria-current="page"><span>pdf出力</span></li>
</ol>
</nav>
<!-- title -->
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0">pdf出力</h1>
</div>
<!-- title -->
<div id="main-ttl">
<div class="container-wrap">
<!-- 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"><a href="report-list.html" class="text-decoration-none text-underline">報告一覧</a></li>
<li class="breadcrumb-item active" aria-current="page"><span>pdf出力</span></li>
</ol>
</nav>
<!-- title -->
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0">pdf出力</h1>
</div>
</div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrint" ></div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrintDiv" ></div>
<!-- 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>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/pushMessageDetail.html
......@@ -4,12 +4,13 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="messageDetail"></title>
<title class="lang" lang="pushMessageDetail"></title>
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<!-- vender css -->
......@@ -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-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/header.js?__UPDATEID__"></script>
<script src="../common/js/constant.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/pushMessageDetail/pushMessageDetail.js"></script>
......@@ -33,47 +34,46 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<!-- message detail -->
<main>
<div class="container-wrap">
<div id="includedMainTitle"></div>
<div class="row">
<div class="col-12">
<div class="card p-4">
<table>
<colgroup>
<col span="1" class="w-100px">
</colgroup>
<tbody>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="operationName"></th>
<td class="p-2" id="operationName"></td>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="sendDate"></th>
<td class="p-2" id="sendDate"></td>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="sender"></th>
<td class="p-2" id="sender"></td>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="content"></th>
<td class="p-2" id="content"></td>
</tr>
</tbody>
</table>
</div>
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- message detail -->
<main>
<div class="container-wrap">
<div id="includedMainTitle"></div>
<div class="row">
<div class="col-12">
<div class="card p-4">
<table>
<colgroup>
<col span="1" class="w-100px">
</colgroup>
<tbody>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="operationName"></th>
<td class="p-2" id="operationName"></td>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="sendDate"></th>
<td class="p-2" id="sendDate"></td>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="sender"></th>
<td class="p-2" id="sender"></td>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="content"></th>
<td class="p-2" id="content"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
</div>
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/pushMessageList.html
......@@ -4,12 +4,13 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="messageListTitle"></title>
<title class="lang" lang="pushMessageList"></title>
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<!-- vender css -->
......@@ -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-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/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 src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
......@@ -34,26 +35,25 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div>
<!-- message list -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedMainTitle"></div>
<!-- message -->
<ul class="card-list message-list p-0" id="messageList">
<li class="card mb-2 not-found d-none">
<div class="text-dark mb-1 px-3 py-5 text-center m-auto">
<img src="../common/img/icon_not_found.svg" alt="メッセージがありません。" class="not-found-img mb-2">
<div class="fs-9 text-secondary font-weight-bold lang" lang="messageListEmpty"></div>
</div>
</li>
</ul>
</div>
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
<div id="loader"></div>
<div id="includedHeader"></div>
<!-- message list -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedMainTitle"></div>
<!-- message -->
<ul class="card-list message-list p-0" id="messageList">
<li class="card mb-2 not-found d-none">
<div class="text-dark mb-1 px-3 py-5 text-center m-auto">
<img src="../common/img/icon_not_found.svg" alt="メッセージがありません。" class="not-found-img mb-2">
<div class="fs-9 text-secondary font-weight-bold lang" lang="messageListEmpty"></div>
</div>
</li>
</ul>
</div>
</main>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/reportForm.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<!-- vender css -->
......@@ -17,54 +18,29 @@
<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 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/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.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 src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head>
<body onload="RF.init();">
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<!-- report list -->
<main>
<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>
<!-- report list -->
<div id="includedMainTitle"></div>
<div class="mb-5" id="report-form"></div>
<div class="mb-5" id="report-form"></div>
<!-- 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>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/reportList.html
......@@ -10,6 +10,7 @@
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<!-- vender css -->
......@@ -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-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/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.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/reportList/reportList.js?__UPDATEID__"></script>
......@@ -34,19 +36,18 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- report list -->
<div class="container-wrap mb-5" id="reportList"></div>
<!-- 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>
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- report list -->
<div class="container-wrap mb-5" id="reportList"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
abweb/html/sendMessage.html
......@@ -3,13 +3,14 @@
<head>
<meta charset="utf-8">
<title class="lang" lang="sendMessageTitle"></title>
<title class="lang" lang="sendMessage"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main 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/style.css">
<!-- vender css -->
......@@ -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-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/validation.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
......@@ -25,7 +27,6 @@
<script type="text/javascript" src="../js/operationSelect/operationSelect.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/sendMessage/sendMessage.js"></script>
......@@ -37,62 +38,61 @@
</head>
<body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="loader"></div>
<div id="includedHeader"></div>
<!-- send message -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedMainTitle"></div>
<!-- content -->
<div class="py-2">
<div class="row">
<div class="col-12">
<form action="#">
<div class="form-group form-row">
<div class="col-lg-1 col-md-2 col-3 control-label">
<button type="button" class="btn btn-sm btn-tertiary lang" lang="buttonOperationSelect" data-toggle="modal" data-target="#task-list-modal"></button>
</div>
<div class="col-lg-11 col-md-10 col-9">
<div id="operationSelected" data-operation-id=""></div>
</div>
<!-- send message -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedMainTitle"></div>
<!-- content -->
<div class="py-2">
<div class="row">
<div class="col-12">
<form action="#">
<div class="form-group form-row">
<div class="col-lg-1 col-md-2 col-3 control-label">
<button type="button" class="btn btn-sm btn-tertiary lang" lang="buttonOperationSelect" data-toggle="modal" data-target="#task-list-modal"></button>
</div>
<div class="form-group form-row">
<label for="address" class="col-lg-1 col-md-2 col-3 control-label lang" lang="labelSendTypeTitle"></label>
<div class="col-lg-11 col-md-10 col-9">
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-sm btn-primary custom active" for="sendTypeGroup">
<input type="radio" name="sendType" id="sendTypeGroup" value="0" autocomplete="off" checked></label>
<label class="btn btn-sm btn-primary custom" for="sendTypeAll">
<input type="radio" name="sendType" id="sendTypeAll" value="1" autocomplete="off"></label>
</div>
</div>
<div class="col-lg-11 col-md-10 col-9">
<div id="operationSelected" data-operation-id=""></div>
</div>
<div class="form-group mb-4">
<div class="d-flex justify-content-between">
<label for="message-content" class="lang" lang="txtMessageContent"></label>
<a href="#" data-toggle="modal" data-target="#select-template-modal" class="lang" lang="buttonTemplateSelection"></a>
</div>
<div class="form-group form-row">
<label for="address" class="col-lg-1 col-md-2 col-3 control-label lang" lang="labelSendTypeTitle"></label>
<div class="col-lg-11 col-md-10 col-9">
<div class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-sm btn-primary custom active" for="sendTypeGroup">
<input type="radio" name="sendType" id="sendTypeGroup" value="0" autocomplete="off" checked></label>
<label class="btn btn-sm btn-primary custom" for="sendTypeAll">
<input type="radio" name="sendType" id="sendTypeAll" value="1" autocomplete="off"></label>
</div>
<textarea name="message-content" class="form-control" id="messageContent" cols="30" rows="10"></textarea>
</div>
</form>
</div>
</div>
<div class="form-group mb-4">
<div class="d-flex justify-content-between">
<label for="message-content" class="lang" lang="txtMessageContent"></label>
<a href="#" data-toggle="modal" data-target="#select-template-modal" class="lang" lang="buttonTemplateSelection"></a>
</div>
<textarea name="message-content" class="form-control" id="messageContent" cols="30" rows="10"></textarea>
</div>
</form>
</div>
</div>
<button type="submit" class="btn btn-primary lang" lang="buttonSend" onclick="SendMessage.onClickSend();"></button>
</div>
<button type="submit" class="btn btn-primary lang" lang="buttonSend" onclick="SendMessage.onClickSend();"></button>
</div>
</main>
<!-- task list modal -->
<div id="includeOperationSelect"></div>
</div>
</main>
<!-- task list modal -->
<div id="includeOperationSelect"></div>
<!-- select template modal -->
<div id="includeTemplateModal"></div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</div>
<!-- select template modal -->
<div id="includeTemplateModal"></div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/js/dashboard/dashboard.js
......@@ -13,8 +13,8 @@ DASHBOARD.pickupItems = [
/** comunication dashboard configuration */
DASHBOARD.communicationItems = [
{ id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'messageListTitle' },
{ id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessageTitle' },
{ id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'pushMessageList' },
{ id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessage' },
];
/** Default dashboard setting data */
......@@ -128,6 +128,7 @@ DASHBOARD.init = function () {
COMMON.checkAuth(false);
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
sessionStorage.removeItem("operationId");
DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) {
......@@ -141,7 +142,7 @@ DASHBOARD.init = function () {
};
/** load common data */
DASHBOARD.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadDashboardSetting('#includedDashboardSetting', DASHBOARD.changeSettingCallback);
TEMPLATE.loadConfirmModal('#includedConfirmModal');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'dashboard', null, DASHBOARD.loadMainTitleCallback);
......
abweb/js/operationList/operationList.js
......@@ -22,11 +22,12 @@ OL.operationGroupMasterId;
*/
OL.init = function () {
console.log('OperationList start');
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', null, null);
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
sessionStorage.removeItem("operationId");
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'workList', true, null);
TEMPLATE.loadConfirmModal('#includedConfirmModal');
//get all data of operation list scene
OL.getAllDataWeb(sessionStorage.OL_searchKeyWord, sessionStorage.OL_sortIndex, sessionStorage.OL_searchStartDate, sessionStorage.OL_searchEndDate, sessionStorage.OL_operationGroupMasterId);
......@@ -316,7 +317,7 @@ OL.createCategoryList = function () {
//create category(operationGroupMaster) structure
for (let i = 0; i < OL.operationGroupMaster.length; i++) {
const item = OL.operationGroupMaster[i];
console.log(item);
// console.log(item);
let inputLabel = $('<label>');
let inputRadio = $('<input type="radio" name="category">');
inputRadio.val(item.operationGroupMasterId);
......@@ -504,11 +505,11 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe
//save operation logs. needed for sorting
OL.saveOperationReadingLog(operationId, operationType, reportType);
//Transition to the report form or operation list screen
sessionStorage.setItem("operationId", operationId);
if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) {
sessionStorage.OL_operationId = operationId;
COMMON.avwScreenMove('reportList.html');
} else {
const url = 'reportForm.html?operationId=' + operationId;
const url = 'reportForm.html?operationId=' + operationId + "&addReport=" + enableAddReport;
COMMON.avwScreenMove(url);
}
};
......
abweb/js/pdfPrint/pdfPrint.js
......@@ -25,26 +25,34 @@ PP.init = function () {
* load common
*/
PP.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../common/html/confirmModal.html', function () {
I18N.initi18n();
});
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
let 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.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.PDF_PRINT,
}
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.PDF_PRINT, navs, null);
};
/**
* init pdf list
*/
PP.initPdfList = function () {
if (sessionStorage.OL_operationId) {
if (sessionStorage.getItem("operationId")) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
params.operationId = sessionStorage.getItem("operationId");
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.QUICK_REPORT_PRINT;
$('#pdfPrint').load(url, params);
$('#pdfPrintDiv').load(url, params);
} else {
COMMON.displayAlert('error');
COMMON.avwScreenMove('reportList.html');
......
abweb/js/pickup/pickup.js
......@@ -134,18 +134,19 @@ PICKUP.getReportWithWarningsListData = function (callback) {
PICKUP.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
console.log('PICKUP.init');
sessionStorage.removeItem("pickUpType");
// sessionStorage.pickUpType = null;
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: 'pickup',
titleLang: CONSTANT.PAGE_NAME.PICKUP,
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null);
......@@ -153,6 +154,8 @@ PICKUP.init = function () {
PICKUP.settingPickup();
COMMON.closeLoading();
};
/**
* Setting pickup data
*/
......@@ -747,6 +750,7 @@ PICKUP.getInspectDate = function (dateString) {
*/
PICKUP.sendReportFormFromNewReport = function (operationId) {
//Transition to the report form or operation list screen
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.NEW_REPORT);
const url = 'reportForm.html?operationId=' + operationId;
COMMON.avwScreenMove(url);
};
......@@ -760,6 +764,7 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
*/
PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, processKey, phaseNo) {
//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;
COMMON.avwScreenMove(url);
};
......@@ -775,6 +780,7 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
*/
PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
//Transition to the report form or operation list screen
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.WARNING_REPORT);
let url = 'reportForm.html?operationId=' + operationId;
switch (reportType) {
case PICKUP.REPORT_TYPE.REPORTONLY:
......
abweb/js/pushMessageDetail/pushMessageDetail.js
......@@ -25,7 +25,7 @@ PushMessageDetail.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
//load common html
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......
abweb/js/pushMessageList/pushMessageList.js
......@@ -11,7 +11,7 @@ PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Client
PushMessageList.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......@@ -21,7 +21,7 @@ PushMessageList.init = function () {
titleLang: 'messageListTitle',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageListTitle', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pushMessageList', navs, null);
PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList);
});
......
abweb/js/reportForm/reportForm.js
......@@ -12,12 +12,105 @@ RF.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
RF.loadCommon();
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
*/
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;
$('#report-form').load(url, params, function () {
initPageLoad();
$('#contentFieldOrverlay').show();
//COMMON.closeLoading();
COMMON.closeLoading();
});
} else {
COMMON.avwScreenMove('index.html');
......
abweb/js/reportList/reportList.js
......@@ -16,37 +16,59 @@ RL.init = function () {
RL.checkQuickReport();
RL.loadCommon();
RL.initTaskReportList();
COMMON.closeLoading();
};
/**
* load common
*/
RL.loadCommon = function () {
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
},
{
titleLang: 'pickup',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'reportList', navs, RL.loadMainTitleCallback);
RL.initBreadcrumb();
};
RL.initBreadcrumb = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
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,
},
]
} 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;
/**
* check quick report
*/
RL.checkQuickReport = function () {
if (sessionStorage.OL_operationId) {
if (sessionStorage.getItem("operationId")) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
params.operationId = sessionStorage.getItem("operationId");
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
COMMON.cmsAjax(
url,
......@@ -70,11 +92,10 @@ RL.checkQuickReport = function () {
* init task report list
*/
RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) {
if (sessionStorage.getItem("operationId")) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
params.operationId = sessionStorage.getItem("operationId");
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 () {
COMMON.closeLoading();
......
abweb/js/sendMessage/sendMessage.js
......@@ -125,7 +125,7 @@ SendMessage.templateSelectedCallback = function (template) {
SendMessage.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadHeader('#includedHeader');
const navs = [
{
titleLang: 'dashboard',
......@@ -135,7 +135,7 @@ SendMessage.init = function () {
titleLang: 'sendMessageTitle',
},
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessageTitle', navs, null);
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessage', navs, null);
TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback);
TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback);
$('#messageContent').attr('maxlength', SendMessage.contentMaxLength);
......
abweb/js/setting/settings.js
......@@ -9,16 +9,38 @@ var SETTINGS = {};
$(document).ready(function () {
//Check if user is logged in
COMMON.checkAuth(false);
SETTINGS.getToken();
SETTINGS.initScreen();
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
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
* @param {*} e
*/
SETTINGS.dspPwdUpd1_Click = function (e) {
// const tokenVal = $('#tokenVal').val();
e.preventDefault();
var isOK = true;
var msgError = $('#main-error-message');
......@@ -72,16 +94,22 @@ SETTINGS.dspPwdUpd1_Click = function (e) {
}
// Do changing password
if (isOK) {
var getToken = $("#getToken").val();
var params = {
sid: ClientData.userInfo_sid(),
loginId: ClientData.userInfo_loginId_session(),
password: SETTINGS.getCurrentPassword(),
newPassword: SETTINGS.getNewPassword(),
language: I18N.getCurrentLanguage(),
token: getToken,
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;
COMMON.cmsAjax(url, params, false, SETTINGS.avwCmsApi_passwordChange_success, SETTINGS.avwCmsApi_passwordChange_fail);
} else {
......@@ -148,7 +176,18 @@ SETTINGS.getNewPasswordRe = function () {
// Initalize screen
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
$('#txtLoginId').text(ClientData.userInfo_loginId_session());
// Account Path
......
abweb/js/template/template.js
......@@ -5,12 +5,12 @@
var TEMPLATE = {};
/** template load header */
TEMPLATE.loadHearder = function (elmentId) {
// COMMON.showLoading();
TEMPLATE.loadHeader = function (elmentId) {
COMMON.showLoading();
$(elmentId).load('../common/html/header.html', function () {
$('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active');
if (sessionStorage.activeHomePage == CONSTANT.PAGE_NAME.OPERATION_LIST) {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.OPERATION_LIST) {
$('#iconHomeWorkList').addClass('active');
} else {
$('#iconHomeDashboard').addClass('active');
......@@ -38,6 +38,7 @@ TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) {
*/
TEMPLATE.loadConfirmModal = function (elmentId) {
$(elmentId).load('../common/html/confirmModal.html', function () {
HEADER.initLogout();
I18N.initi18n();
});
};
......@@ -86,6 +87,7 @@ TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, navs, completeCallba
if (navs) {
titleHtmlPath = '../common/html/mainNavTitle.html';
}
$(elmentId).load(titleHtmlPath, function (data) {
$(elmentId).replaceWith(data);
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