Skip to content

C
check
Commit 79ca3bbd by Kang Donghun
Options

ローディング修正

parent f0c78053
Showing with 286 additions and 286 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/js/common.js
...@@ -20,7 +20,7 @@ COMMON.hasErrorKey = 'AVW_HASERR'; ...@@ -20,7 +20,7 @@ COMMON.hasErrorKey = 'AVW_HASERR';
* @param {*} url * @param {*} url
*/ */
COMMON.avwScreenMove = function (url) { COMMON.avwScreenMove = function (url) {
// COMMON.showLoading(); COMMON.showLoading();
window.onbeforeunload = null; window.onbeforeunload = null;
window.location = url; window.location = url;
}; };
...@@ -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);
}; };
/** /**
...@@ -167,10 +164,10 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty ...@@ -167,10 +164,10 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
} else if (result.httpStatus == '401') { } else if (result.httpStatus == '401') {
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN); COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
} else if (result.httpStatus == '403') { } else if (result.httpStatus == '403') {
// COMMON.closeLoading(); COMMON.closeLoading();
COMMON.displayAlert('errorOccurred'); COMMON.displayAlert('errorOccurred');
} else { } else {
// COMMON.closeLoading(); COMMON.closeLoading();
COMMON.displayAlert(result.message); COMMON.displayAlert(result.message);
} }
}, },
...@@ -178,7 +175,7 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty ...@@ -178,7 +175,7 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
if (errorCallback) { if (errorCallback) {
errorCallback(XMLHttpRequest, textStatus, errorThrown); errorCallback(XMLHttpRequest, textStatus, errorThrown);
} else { } else {
// COMMON.closeLoading(); COMMON.closeLoading();
COMMON.displayAlert('errorCommunicationFailed'); COMMON.displayAlert('errorCommunicationFailed');
} }
}, },
...@@ -187,7 +184,7 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty ...@@ -187,7 +184,7 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
if (errorCallback) { if (errorCallback) {
errorCallback(); errorCallback();
} else { } else {
// COMMON.closeLoading(); COMMON.closeLoading();
COMMON.displayAlert('errorOccurred'); COMMON.displayAlert('errorOccurred');
} }
} }
...@@ -965,25 +962,6 @@ COMMON.currentTime = function () { ...@@ -965,25 +962,6 @@ COMMON.currentTime = function () {
return Date.now(); return Date.now();
}; };
/**
* create UUID For token
*
*/
COMMON.generateUuid = function() {
var chars = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".split("");
for (var i = 0, len = chars.length; i < len; i++) {
switch (chars[i]) {
case "x":
chars[i] = Math.floor(Math.random() * 16).toString(16);
break;
case "y":
chars[i] = (Math.floor(Math.random() * 4) + 8).toString(16);
break;
}
}
return chars.join("");
}
/* /*
* Operations for session storage [ end ] * Operations for session storage [ end ]
*/ */
......
abweb/html/accountSetting.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 -->
...@@ -29,76 +30,75 @@ ...@@ -29,76 +30,75 @@
</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> <div id="includedMainTitle"></div>
<main id="main"> <main id="main">
<div class="container-wrap"> <div class="container-wrap">
<!-- 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="accountSetting"></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">
</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 class="col-md-6 col-12 mb-4"> </div>
<div class="card p-4 password"> <div class="col-md-6 col-12 mb-4">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2> <div class="card p-4 password">
<form> <h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2>
<div class="form-group mb-3"> <form>
<label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label> <div class="form-group mb-3">
<input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current"> <label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label>
</div> <input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current">
<div class="form-group mb-3"> </div>
<label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label> <div class="form-group mb-3">
<input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new"> <label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label>
</div> <input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new">
<div class="form-group mb-4"> </div>
<label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label> <div class="form-group mb-4">
<input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm"> <label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label>
</div> <input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm">
<p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p> </div>
<button type="submit" class="btn btn-primary lang" lang="dspChange" id="dspPwdUpd1">変更</button> <p class="error lang" id="main-error-message" style="display:none;">パスワードまたはIDに誤りがあります</p>
</form> <button type="submit" class="btn btn-primary lang" lang="dspChange" id="dspPwdUpd1">変更</button>
</div> </form>
</div> </div>
</div> </div>
</div> </div>
</main>
<!-- 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> </div>
<input type="hidden" id="getToken"> </main>
<!-- confirm -->
<div id="includedConfirmModal"></div> <!-- alert -->
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <div class="alert-overlay d-none"></div>
<script src="../common/js/event.js?__UPDATEID__"></script> <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> </div>
<input type="hidden" id="getToken">
<!-- 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
...@@ -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,37 +38,36 @@ ...@@ -37,37 +38,36 @@
</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 -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<!-- sub title --> <!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="pickupHeader" lang="pickup"></h2> <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/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">
...@@ -43,6 +44,7 @@ ...@@ -43,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">
...@@ -52,7 +54,7 @@ ...@@ -52,7 +54,7 @@
<input type="text" class="form-control lang" lang="txtLoginId" placeholder="txtLoginId" id="txtAccId" maxlength="54" > <input type="text" class="form-control lang" lang="txtLoginId" placeholder="txtLoginId" id="txtAccId" maxlength="54" >
</div> </div>
<div class="form-group mb-2"> <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>
<div class="form-group mb-2"> <div class="form-group mb-2">
<select class="form-control" id="languageSelect"> <select class="form-control" id="languageSelect">
......
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 -->
...@@ -36,34 +37,33 @@ ...@@ -36,34 +37,33 @@
</head> </head>
<body> <body>
<div id="contentFieldOrverlay" style="display: none;"> <div id="loader"></div>
<!-- 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="pdfPrintDiv" ></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/pushMessageDetail.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 -->
...@@ -33,47 +34,46 @@ ...@@ -33,47 +34,46 @@
</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 -->
<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>
</main> </div>
<script type="text/javascript" src="../common/js/app.js"></script> </main>
<script src="../common/js/event.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js"></script>
</div> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/pushMessageList.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 -->
...@@ -34,26 +35,25 @@ ...@@ -34,26 +35,25 @@
</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>
<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
...@@ -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 -->
...@@ -28,19 +29,18 @@ ...@@ -28,19 +29,18 @@
</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 -->
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<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
...@@ -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 -->
...@@ -35,19 +36,18 @@ ...@@ -35,19 +36,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>
<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
...@@ -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,62 +38,61 @@ ...@@ -37,62 +38,61 @@
</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>
<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 class="col-lg-11 col-md-10 col-9">
<div id="operationSelected" data-operation-id=""></div>
</div>
</div> </div>
<div class="form-group form-row"> <div class="col-lg-11 col-md-10 col-9">
<label for="address" class="col-lg-1 col-md-2 col-3 control-label lang" lang="labelSendTypeTitle"></label> <div id="operationSelected" data-operation-id=""></div>
<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> </div>
<div class="form-group mb-4"> </div>
<div class="d-flex justify-content-between"> <div class="form-group form-row">
<label for="message-content" class="lang" lang="txtMessageContent"></label> <label for="address" class="col-lg-1 col-md-2 col-3 control-label lang" lang="labelSendTypeTitle"></label>
<a href="#" data-toggle="modal" data-target="#select-template-modal" class="lang" lang="buttonTemplateSelection"></a> <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>
<textarea name="message-content" class="form-control" id="messageContent" cols="30" rows="10"></textarea>
</div> </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>
</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>
</main>
<!-- task list modal --> </div>
<div id="includeOperationSelect"></div> </main>
<!-- task list modal -->
<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/login/login.js
...@@ -390,11 +390,11 @@ LOGIN.changeLanguage = function (lang) { ...@@ -390,11 +390,11 @@ LOGIN.changeLanguage = function (lang) {
// Login click function // Login click function
LOGIN.loginFunction = function () { LOGIN.loginFunction = function () {
// COMMON.showLoading(); COMMON.showLoading();
if (LOGIN.checkValidation()) { if (LOGIN.checkValidation()) {
LOGIN.processLogin(); LOGIN.processLogin();
} else { } else {
// COMMON.closeLoading(); COMMON.closeLoading();
} }
}; };
...@@ -424,14 +424,14 @@ LOGIN.skipPassFunction = function () { ...@@ -424,14 +424,14 @@ LOGIN.skipPassFunction = function () {
// Open Change Password Dialog // Open Change Password Dialog
LOGIN.OpenChangePasswordDialog = function () { LOGIN.OpenChangePasswordDialog = function () {
$('#password-reset-modal').show(); $('#password-reset-modal').show();
// COMMON.showLoading(); COMMON.showLoading();
console.log('password open'); console.log('password open');
}; };
// Close Chnage Password Dialog // Close Chnage Password Dialog
LOGIN.CloseChangePasswordDialog = function () { LOGIN.CloseChangePasswordDialog = function () {
$('#main-password-change').hide(); $('#main-password-change').hide();
// COMMON.closeLoading(); COMMON.closeLoading();
}; };
// Save Service Option // Save Service Option
......
abweb/js/operationList/operationList.js
...@@ -449,7 +449,7 @@ OL.sortOperationList = function (sortNumber) { ...@@ -449,7 +449,7 @@ OL.sortOperationList = function (sortNumber) {
* search operarionList * search operarionList
*/ */
OL.search = function () { OL.search = function () {
// COMMON.showLoading(); COMMON.showLoading();
const searchKeyword = $('#searchTaskName').val(); const searchKeyword = $('#searchTaskName').val();
const searchStartDate = $('#searchStartDate').val(); const searchStartDate = $('#searchStartDate').val();
const searchEndDate = $('#searchEndDate').val(); const searchEndDate = $('#searchEndDate').val();
......
abweb/js/reportForm/reportForm.js
...@@ -134,8 +134,7 @@ RF.initFormView = function () { ...@@ -134,8 +134,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,7 +16,7 @@ RL.init = function () { ...@@ -16,7 +16,7 @@ RL.init = function () {
RL.checkQuickReport(); RL.checkQuickReport();
RL.loadCommon(); RL.loadCommon();
RL.initTaskReportList(); RL.initTaskReportList();
// COMMON.closeLoading(); COMMON.closeLoading();
}; };
/** /**
......
abweb/js/setting/settings.js
...@@ -12,7 +12,7 @@ $(document).ready(function () { ...@@ -12,7 +12,7 @@ $(document).ready(function () {
SETTINGS.getToken(); SETTINGS.getToken();
SETTINGS.initScreen(); SETTINGS.initScreen();
$('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click); $('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
// COMMON.closeLoading(); COMMON.closeLoading();
}); });
SETTINGS.getToken = function () { SETTINGS.getToken = function () {
......
abweb/js/template/template.js
...@@ -6,7 +6,7 @@ var TEMPLATE = {}; ...@@ -6,7 +6,7 @@ var TEMPLATE = {};
/** template load header */ /** template load header */
TEMPLATE.loadHeader = 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');
......
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