Skip to content

C
check
Commit 5168bcdd by Takumi Imai
Options

#49772　ローディング

parent 4d6db034
Showing with 377 additions and 362 deletions
abweb/common/js/common.js
...@@ -38,7 +38,10 @@ COMMON.showLoading = function () { ...@@ -38,7 +38,10 @@ COMMON.showLoading = function () {
* close loading * close loading
*/ */
COMMON.closeLoading = function () { COMMON.closeLoading = function () {
$.LoadingOverlay('hide'); setTimeout(function () {
$('#contentFieldOrverlay').show();
$.LoadingOverlay('hide');
}, 500);
}; };
/** /**
......
abweb/common/js/event.js
...@@ -138,18 +138,3 @@ $('.view-menu .view-block-btn').on('click', function () { ...@@ -138,18 +138,3 @@ $('.view-menu .view-block-btn').on('click', function () {
$('.view-content').removeClass('view-list'); $('.view-content').removeClass('view-list');
$('.view-content').addClass('view-block'); $('.view-content').addClass('view-block');
}); });
/** loading */
$(function () {
function e() {
setTimeout(function () {
$.LoadingOverlay('hide');
}, 2000);
}
$('.search-form-btn').on('click', function () {
$.LoadingOverlay('show', {
image: 'img/loading.gif',
});
e();
});
});
abweb/common/js/header.js
...@@ -5,81 +5,78 @@ ...@@ -5,81 +5,78 @@
* @since cms:1.4.3.2&1.4.3.3 web:1.0 * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var HEADER = {}; var HEADER = {};
$(function () {
COMMON.showLoading();
});
/** Direct home page setting */ /** Direct home page setting */
HEADER.goToHomePage = function (pageId) { HEADER.goToHomePage = function (pageId) {
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1) if (settings.dashboardHome == 1) {
{
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
HEADER.goDashboard(); HEADER.goDashboard();
} } else {
else
{
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST; sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.goOperationList(); HEADER.goOperationList();
} }
}); });
} };
/**
/** * Go page of operationList
* Go page of operationList */
*/ HEADER.goOperationList = function () {
HEADER.goOperationList = function () {
OL.init(); OL.init();
}; };
/** /**
* Go page of dashboard * Go page of dashboard
*/ */
HEADER.goDashboard = function () { HEADER.goDashboard = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
COMMON.avwScreenMove("dashboard.html"); COMMON.avwScreenMove('dashboard.html');
}; };
/**
/** * Initialize with any navigation
* Initialize with any navigation *
* * @param {String} bottomNav
* @param {String} bottomNav */
*/ HEADER.activeInitBottomNav = function (bottomNav) {
HEADER.activeInitBottomNav = function (bottomNav) { HEADER.inactiveAllBottomNav();
HEADER.inactiveAllBottomNav(); HEADER.activeBottomNav(bottomNav);
HEADER.activeBottomNav(bottomNav); };
};
/**
/** * change inactive all footer bottom
* change inactive all footer bottom */
*/ HEADER.inactiveAllBottomNav = function () {
HEADER.inactiveAllBottomNav = function () { let navs = document.getElementsByClassName('bottom-nav');
let navs = document.getElementsByClassName('bottom-nav'); for (i = 0; i < navs.length; i++) {
for (i = 0; i < navs.length; i++) { navs[i].className = navs[i].className.replace('text-primary', 'text-secondary');
navs[i].className = navs[i].className.replace('text-primary', 'text-secondary'); let img = navs[i].querySelector('img');
let img = navs[i].querySelector('img'); if (img && img.getAttribute('data-inactive-src')) {
if (img && img.getAttribute('data-inactive-src')) { img.src = img.getAttribute('data-inactive-src');
img.src = img.getAttribute('data-inactive-src'); }
} }
} };
};
/**
* Change specific footer bottom to active.
/** *
* Change specific footer bottom to active. * @param {String} bottomNavId
* */
* @param {String} bottomNavId HEADER.activeBottomNav = function (bottomNavId) {
*/ let elm = $('#' + bottomNavId);
HEADER.activeBottomNav = function (bottomNavId) { if (typeof elm !== 'object') {
let elm = $('#' + bottomNavId); console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId);
if (typeof elm !== 'object') { return;
console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId); }
return; elm.removeClass('text-secondary');
} elm.addClass('text-primary');
elm.removeClass('text-secondary'); let img = elm.find('img')[0];
elm.addClass('text-primary'); if (img && img.getAttribute('data-src')) {
let img = elm.find('img')[0]; img.src = img.getAttribute('data-src');
if (img && img.getAttribute('data-src')) { }
img.src = img.getAttribute('data-src'); };
}
};
abweb/html/accountSetting.html
...@@ -27,78 +27,79 @@ ...@@ -27,78 +27,79 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- account setting --> <!-- account setting -->
<main id="main"> <main id="main">
<div class="container-wrap"> <div class="container-wrap">
<!-- title --> <!-- title -->
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="account_setting">アカウント設定</h1> <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="accountInformation">アカウント情報</h2>
<table> <table>
<colgroup> <colgroup>
<col span="1" class="w-120px"> <col span="1" class="w-120px">
</colgroup> </colgroup>
<tbody> <tbody>
<tr class="border-bottom"> <tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="txtLoginId">ログインID</th> <th class="fs-9 p-2 text-secondary lang" lang="txtLoginId">ログインID</th>
<td class="p-2" lang="txtLoginId" id="txtLoginId">login-idlogin-idlogin-id</td> <td class="p-2" lang="txtLoginId" id="txtLoginId">login-idlogin-idlogin-id</td>
</tr> </tr>
<tr class="border-bottom"> <tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="txtLoginAccPath">アカウントパス</th> <th class="fs-9 p-2 text-secondary lang" lang="txtLoginAccPath">アカウントパス</th>
<td class="p-2" lang="txtLoginAccPath" id="txtLoginAccPath">account-textaccount</td> <td class="p-2" lang="txtLoginAccPath" id="txtLoginAccPath">account-textaccount</td>
</tr> </tr>
<tr class="border-bottom"> <tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="txtLoginDate">ログイン日時</th> <th class="fs-9 p-2 text-secondary lang" lang="txtLoginDate">ログイン日時</th>
<td class="p-2" lang="txtLastLoginTime" id="txtLastLoginTime">2022/09/30 12:00:00</td> <td class="p-2" lang="txtLastLoginTime" id="txtLastLoginTime">2022/09/30 12:00:00</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> <div class="col-md-6 col-12 mb-4">
<div class="col-md-6 col-12 mb-4"> <div class="card p-4 password">
<div class="card p-4 password"> <h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2>
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2> <form>
<form> <div class="form-group mb-3">
<div class="form-group mb-3"> <label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label>
<label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label> <input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current">
<input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current"> </div>
</div> <div class="form-group mb-3">
<div class="form-group mb-3"> <label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label>
<label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label> <input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new">
<input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new"> </div>
</div> <div class="form-group mb-4">
<div class="form-group mb-4"> <label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label>
<label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label> <input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm">
<input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm"> </div>
</div> <p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p> <button type="submit" class="btn btn-primary lang" lang="dspChange" id="dspPwdUpd1">変更</button>
<button type="submit" class="btn btn-primary lang" lang="dspChange" id="dspPwdUpd1">変更</button> </form>
</form> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </main>
</main>
<!-- alert --> <!-- alert -->
<div class="alert-overlay d-none"></div> <div class="alert-overlay d-none"></div>
<div class="alert-area d-none"> <div class="alert-area d-none">
<i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i> <i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i>
<div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div> <div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div>
</div>
<!-- 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>
<!-- 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> </body>
</html> </html>
abweb/html/dashboard.html
...@@ -37,35 +37,37 @@ ...@@ -37,35 +37,37 @@
</head> </head>
<body> <body>
<!-- header --> <div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div> <!-- header -->
<!-- dashboard --> <div id="includedHeader"></div>
<main> <!-- dashboard -->
<div class="container-wrap"> <main>
<div id="includedMainTitle"></div> <div class="container-wrap">
<div id="includedMainTitle"></div>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup"></h2> <!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup"></h2>
<!-- card --> <!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" > <ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" >
</ul> </ul>
<!-- sub title --> <!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" lang="communication"></h2> <h2 class="fs-8 font-weight-bold lang" lang="communication"></h2>
<!-- card --> <!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id="communicationItems"> <ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id="communicationItems">
</ul> </ul>
</div> </div>
</main> </main>
<!-- dashboard setting model --> <!-- dashboard setting model -->
<div id="includedDashboardSetting"></div> <div id="includedDashboardSetting"></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/pdfPrint.html
...@@ -33,33 +33,34 @@ ...@@ -33,33 +33,34 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- title --> <!-- title -->
<div id="main-ttl"> <div id="main-ttl">
<div class="container-wrap"> <div class="container-wrap">
<!-- breadcrumb --> <!-- breadcrumb -->
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0"> <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="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"><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> <li class="breadcrumb-item active" aria-current="page"><span>pdf出力</span></li>
</ol> </ol>
</nav> </nav>
<!-- title --> <!-- title -->
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0">pdf出力</h1> <h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0">pdf出力</h1>
</div>
</div> </div>
</div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ --> <!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrint" ></div> <div class="container-wrap mb-5" id="pdfPrint" ></div>
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script 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
...@@ -33,46 +33,47 @@ ...@@ -33,46 +33,47 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- message detail --> <!-- message detail -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card p-4"> <div class="card p-4">
<table> <table>
<colgroup> <colgroup>
<col span="1" class="w-100px"> <col span="1" class="w-100px">
</colgroup> </colgroup>
<tbody> <tbody>
<tr class="border-bottom"> <tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="operationName"></th> <th class="fs-9 p-2 text-secondary lang" lang="operationName"></th>
<td class="p-2" id="operationName"></td> <td class="p-2" id="operationName"></td>
</tr> </tr>
<tr class="border-bottom"> <tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="sendDate"></th> <th class="fs-9 p-2 text-secondary lang" lang="sendDate"></th>
<td class="p-2" id="sendDate"></td> <td class="p-2" id="sendDate"></td>
</tr> </tr>
<tr class="border-bottom"> <tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="sender"></th> <th class="fs-9 p-2 text-secondary lang" lang="sender"></th>
<td class="p-2" id="sender"></td> <td class="p-2" id="sender"></td>
</tr> </tr>
<tr class="border-bottom"> <tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="content"></th> <th class="fs-9 p-2 text-secondary lang" lang="content"></th>
<td class="p-2" id="content"></td> <td class="p-2" id="content"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </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
...@@ -33,26 +33,26 @@ ...@@ -33,26 +33,26 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div>
<div id="includedHeader"></div> <!-- message list -->
<!-- message list --> <main>
<main> <div class="container-wrap">
<div class="container-wrap"> <!-- header -->
<!-- header --> <div id="includedMainTitle"></div>
<div id="includedMainTitle"></div> <!-- message -->
<!-- message --> <ul class="card-list message-list p-0" id="messageList">
<ul class="card-list message-list p-0" id="messageList"> <li class="card mb-2 not-found d-none">
<li class="card mb-2 not-found d-none"> <div class="text-dark mb-1 px-3 py-5 text-center m-auto">
<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">
<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 class="fs-9 text-secondary font-weight-bold lang" lang="messageListEmpty"></div> </div>
</div> </li>
</li> </ul>
</ul> </div>
</div> </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
...@@ -21,46 +21,47 @@ ...@@ -21,46 +21,47 @@
<script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/header/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="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
</head> </head>
<body onload="RF.init();"> <body onload="RF.init();">
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- report list --> <!-- report list -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- breadcrumb --> <!-- breadcrumb -->
<nav aria-label="breadcrumb"> <nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0"> <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="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>
<li class="breadcrumb-item active" aria-current="page"><span>報告</span></li> <li class="breadcrumb-item active" aria-current="page"><span>報告</span></li>
</ol> </ol>
</nav> </nav>
<!-- title --> <!-- title -->
<div class="d-flex align-items-center"> <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> <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 style="display: none;">
<div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div> <div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>
<div><span id="inspectDate"></span></div> <div><span id="inspectDate"></span></div>
</div> </div>
<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();"> <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"> <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> </div>
</div> </main>
</main>
<div class="mb-5" id="report-form"></div> <div class="mb-5" id="report-form"></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/reportList.html
...@@ -33,19 +33,20 @@ ...@@ -33,19 +33,20 @@
</script> </script>
</head> </head>
<body > <body>
<div id="contentFieldOrverlay" style="display: none;">
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<!-- report list --> <!-- report list -->
<div class="container-wrap mb-5" id="reportList"></div> <div class="container-wrap mb-5" id="reportList"></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>
abweb/html/sendMessage.html
...@@ -36,61 +36,62 @@ ...@@ -36,61 +36,62 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;">
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- send message --> <!-- send message -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- header --> <!-- header -->
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<!-- content --> <!-- content -->
<div class="py-2"> <div class="py-2">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<form action="#"> <form action="#">
<div class="form-group form-row"> <div class="form-group form-row">
<div class="col-lg-1 col-md-2 col-3 control-label"> <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> <button type="button" class="btn btn-sm btn-tertiary lang" lang="buttonOperationSelect" data-toggle="modal" data-target="#task-list-modal"></button>
</div> </div>
<div class="col-lg-11 col-md-10 col-9"> <div class="col-lg-11 col-md-10 col-9">
<div id="operationSelected" data-operation-id=""></div> <div id="operationSelected" data-operation-id=""></div>
</div>
</div> </div>
</div> <div class="form-group form-row">
<div class="form-group form-row"> <label for="address" class="col-lg-1 col-md-2 col-3 control-label lang" lang="labelSendTypeTitle"></label>
<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="col-lg-11 col-md-10 col-9"> <div class="btn-group btn-group-toggle" data-toggle="buttons">
<div class="btn-group btn-group-toggle" data-toggle="buttons"> <label class="btn btn-sm btn-primary custom active" for="sendTypeGroup">
<label class="btn btn-sm btn-primary custom active" for="sendTypeGroup"> <input type="radio" name="sendType" id="sendTypeGroup" value="0" autocomplete="off" checked></label>
<input type="radio" name="sendType" id="sendTypeGroup" value="0" autocomplete="off" checked></label> <label class="btn btn-sm btn-primary custom" for="sendTypeAll">
<label class="btn btn-sm btn-primary custom" for="sendTypeAll"> <input type="radio" name="sendType" id="sendTypeAll" value="1" autocomplete="off"></label>
<input type="radio" name="sendType" id="sendTypeAll" value="1" autocomplete="off"></label> </div>
</div> </div>
</div> </div>
</div> <div class="form-group mb-4">
<div class="form-group mb-4"> <div class="d-flex justify-content-between">
<div class="d-flex justify-content-between"> <label for="message-content" class="lang" lang="txtMessageContent"></label>
<label for="message-content" class="lang" lang="txtMessageContent"></label> <a href="#" data-toggle="modal" data-target="#select-template-modal" class="lang" lang="buttonTemplateSelection"></a>
<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> </div>
<textarea name="message-content" class="form-control" id="messageContent" cols="30" rows="10"></textarea> </form>
</div> </div>
</form>
</div> </div>
</div>
<button type="submit" class="btn btn-primary lang" lang="buttonSend" onclick="SendMessage.onClickSend();"></button> <button type="submit" class="btn btn-primary lang" lang="buttonSend" onclick="SendMessage.onClickSend();"></button>
</div> </div>
</div> </div>
</main> </main>
<!-- task list modal --> <!-- task list modal -->
<div id="includeOperationSelect"></div> <div id="includeOperationSelect"></div>
<!-- select template modal --> <!-- select template modal -->
<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
...@@ -134,6 +134,7 @@ DASHBOARD.init = function () { ...@@ -134,6 +134,7 @@ DASHBOARD.init = function () {
DASHBOARD.initCommunications(); DASHBOARD.initCommunications();
}); });
}); });
COMMON.closeLoading();
}; };
/** load common data */ /** load common data */
DASHBOARD.loadCommon = function () { DASHBOARD.loadCommon = function () {
......
abweb/js/pdfPrint/pdfPrint.js
...@@ -14,6 +14,8 @@ PP.init = function () { ...@@ -14,6 +14,8 @@ PP.init = function () {
PP.loadCommon(); PP.loadCommon();
PP.initPdfList(); PP.initPdfList();
COMMON.closeLoading();
}; };
PP.loadCommon = function () { PP.loadCommon = function () {
......
abweb/js/pickup/pickup.js
...@@ -150,6 +150,7 @@ PICKUP.init = function () { ...@@ -150,6 +150,7 @@ PICKUP.init = function () {
TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null);
PICKUP.initSettingActivePickup(); PICKUP.initSettingActivePickup();
PICKUP.settingPickup(); PICKUP.settingPickup();
COMMON.closeLoading();
}; };
/** /**
* Setting pickup data * Setting pickup data
......
abweb/js/pushMessageDetail/pushMessageDetail.js
...@@ -48,6 +48,7 @@ PushMessageDetail.init = function () { ...@@ -48,6 +48,7 @@ PushMessageDetail.init = function () {
PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function (message) { PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function (message) {
PushMessageDetail.showMessage(message); PushMessageDetail.showMessage(message);
}); });
COMMON.closeLoading();
}; };
/** /**
......
abweb/js/pushMessageList/pushMessageList.js
...@@ -25,6 +25,7 @@ PushMessageList.init = function () { ...@@ -25,6 +25,7 @@ PushMessageList.init = function () {
PushMessageList.getMessageList(function (messageList) { PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList); PushMessageList.generateMessageListHtml(messageList.pushMessageList);
}); });
COMMON.closeLoading();
}; };
/** /**
......
abweb/js/reportForm/reportForm.js
...@@ -12,6 +12,7 @@ RF.init = function () { ...@@ -12,6 +12,7 @@ RF.init = function () {
RF.loadCommon(); RF.loadCommon();
RF.initFormView(); RF.initFormView();
COMMON.closeLoading();
}; };
RF.loadCommon = function () { RF.loadCommon = function () {
...@@ -36,6 +37,7 @@ RF.initFormView = function () { ...@@ -36,6 +37,7 @@ RF.initFormView = function () {
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
params.lang = I18N.getCurrentLanguage;
if (taskKey) params.taskKey = taskKey; if (taskKey) params.taskKey = taskKey;
if (replyNo) params.replyNo = replyNo; if (replyNo) params.replyNo = replyNo;
if (processKey) params.processKey = processKey; if (processKey) params.processKey = processKey;
......
abweb/js/reportList/reportList.js
...@@ -13,12 +13,13 @@ RL.init = function () { ...@@ -13,12 +13,13 @@ RL.init = function () {
RL.checkQuickReport(); RL.checkQuickReport();
RL.loadCommon(); RL.loadCommon();
RL.initTaskReportList(); RL.initTaskReportList();
COMMON.closeLoading();
}; };
RL.loadCommon = function() { RL.loadCommon = function () {
TEMPLATE.loadHearder("#includedHeader"); TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadConfirmModal("#includedConfirmModal"); TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
href: 'dashboard.html', href: 'dashboard.html',
...@@ -27,29 +28,35 @@ RL.loadCommon = function() { ...@@ -27,29 +28,35 @@ RL.loadCommon = function() {
titleLang: 'pickup', titleLang: 'pickup',
}, },
]; ];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "reportList", navs, RL.loadMainTitleCallback); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'reportList', navs, RL.loadMainTitleCallback);
} };
RL.isQuickReport; RL.isQuickReport;
RL.checkQuickReport = function() { RL.checkQuickReport = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId; params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST; params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
COMMON.cmsAjax(url, params, false, function(result) { COMMON.cmsAjax(
RL.isQuickReport = result.isQuickReport; url,
}, function() { params,
COMMON.displayAlert("msgOperationEmpty"); false,
COMMON.avwScreenMove("index.html"); function (result) {
}); RL.isQuickReport = result.isQuickReport;
},
function () {
COMMON.displayAlert('msgOperationEmpty');
COMMON.avwScreenMove('index.html');
},
);
} else { } else {
COMMON.displayAlert("error"); COMMON.displayAlert('error');
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} }
} };
RL.initTaskReportList = function () { RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
...@@ -68,7 +75,6 @@ RL.initTaskReportList = function () { ...@@ -68,7 +75,6 @@ RL.initTaskReportList = function () {
RL.loadMainTitleCallback = function () { RL.loadMainTitleCallback = function () {
//add dashboard setting item //add dashboard setting item
if (RL.isQuickReport) { if (RL.isQuickReport) {
var elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'); var elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">');
let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">'); let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">');
elmImg.attr('title', I18N.i18nText('reportList')); elmImg.attr('title', I18N.i18nText('reportList'));
......
abweb/js/sendMessage/sendMessage.js
...@@ -129,4 +129,6 @@ SendMessage.init = function () { ...@@ -129,4 +129,6 @@ SendMessage.init = function () {
I18N.initi18n(); I18N.initi18n();
$("label[for='sendTypeGroup']").append(I18N.i18nText('labelSendTypeGroup')); $("label[for='sendTypeGroup']").append(I18N.i18nText('labelSendTypeGroup'));
$("label[for='sendTypeAll']").append(I18N.i18nText('labelSendTypeAll')); $("label[for='sendTypeAll']").append(I18N.i18nText('labelSendTypeAll'));
COMMON.closeLoading();
}; };
abweb/js/setting/settings.js
...@@ -11,6 +11,7 @@ $(document).ready(function () { ...@@ -11,6 +11,7 @@ $(document).ready(function () {
COMMON.checkAuth(false); COMMON.checkAuth(false);
SETTINGS.initScreen(); SETTINGS.initScreen();
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click); $('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
COMMON.closeLoading();
}); });
// Process changing password // Process changing password
......
abweb/js/topPage/topPage.js
...@@ -19,7 +19,6 @@ $(document).ready(function () { ...@@ -19,7 +19,6 @@ $(document).ready(function () {
* show page * show page
*/ */
TOP.init = function () { TOP.init = function () {
COMMON.showLoading();
HEADER.goToHomePage(); HEADER.goToHomePage();
COMMON.closeLoading(); COMMON.closeLoading();
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment