Skip to content

C
check
Commit 611a9940 by Kang Donghun
Options

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

Feature/1.0 check web dev imai

See merge request !78
parents 0639f7a5 8c4ec6ae
Showing with 250 additions and 206 deletions
abweb/html/accountSetting.html
......@@ -35,68 +35,70 @@
<div id="includedHeader"></div>
<!-- account setting -->
<div id="includedMainTitle"></div>
<main id="main">
<div class="container-wrap">
<!-- content -->
<div class="row">
<div class="col-md-6 col-12 mb-4">
<div class="card p-4">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="accountSetting"></h2>
<table>
<colgroup>
<col span="1" class="w-120px">
</colgroup>
<tbody>
<tr class="border-bottom">
<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>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="txtLoginAccPath">アカウントパス</th>
<td class="p-2" lang="txtLoginAccPath" id="txtLoginAccPath">account-textaccount</td>
</tr>
<tr class="border-bottom">
<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>
</tr>
</tbody>
</table>
<div id="loadingNone" style="display:none;">
<main id="main">
<div class="container-wrap">
<!-- content -->
<div class="row">
<div class="col-md-6 col-12 mb-4">
<div class="card p-4">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="accountSetting"></h2>
<table>
<colgroup>
<col span="1" class="w-120px">
</colgroup>
<tbody>
<tr class="border-bottom">
<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>
</tr>
<tr class="border-bottom">
<th class="fs-9 p-2 text-secondary lang" lang="txtLoginAccPath">アカウントパス</th>
<td class="p-2" lang="txtLoginAccPath" id="txtLoginAccPath">account-textaccount</td>
</tr>
<tr class="border-bottom">
<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>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-md-6 col-12 mb-4">
<div class="card p-4 password">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2>
<form>
<div class="form-group mb-3">
<label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label>
<input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current">
</div>
<div class="form-group mb-3">
<label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new">
</div>
<div class="form-group mb-4">
<label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm">
</div>
<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>
</form>
<div class="col-md-6 col-12 mb-4">
<div class="card p-4 password">
<h2 class="fs-10 font-weight-bold mb-3 lang" lang="dspPwdUpd">パスワード変更</h2>
<form>
<div class="form-group mb-3">
<label id="lblPwdCur" class="lang" lang="txtPwdCurr">現在のパスワード</label>
<input type="password" class="form-control" id="txtPwdCur" maxlength="16" aria-describedby="current">
</div>
<div class="form-group mb-3">
<label id="lblPwdNew" class="lang" lang="txtPwdNew">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNew" maxlength="16" aria-describedby="new">
</div>
<div class="form-group mb-4">
<label id="lblPwdNewRe" class="lang" lang="txtPwdNewRe">新しいパスワード</label>
<input type="password" class="form-control" id="txtPwdNewRe" maxlength="16" aria-describedby="confirm">
</div>
<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>
</form>
</div>
</div>
</div>
</div>
</div>
</main>
</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>
<!-- 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>
<input type="hidden" id="getToken">
<!-- confirm -->
<div id="includedConfirmModal"></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>
......
abweb/html/dashboard.html
......@@ -41,32 +41,35 @@
<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>
<div id="loadingNone" style="display:none;">
<!-- 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>
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/pdfPrint.html
......@@ -40,15 +40,17 @@
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<!-- title -->
<div id="includedMainTitle"></div>
<!-- title -->
<div id="includedMainTitle"></div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrintDiv" ></div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="pdfPrintDiv" ></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/pushMessageDetail.html
......@@ -37,41 +37,43 @@
<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 id="loadingNone" style="display:none;">
<!-- 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>
</div>
</div>
</main>
</main>
</div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/pushMessageList.html
......@@ -37,22 +37,24 @@
<body>
<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>
<div id="loadingNone" style="display:none;">
<!-- 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>
</div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/reportForm.html
......@@ -32,14 +32,24 @@
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="loadingNone" style="display:none;">
<div id="includedMainTitle"></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>
<!-- report list -->
<div class="mb-5" id="report-form"></div>
<div id="includedMainTitle"></div>
<!-- report list -->
<div class="mb-5" id="report-form"></div>
<div id="includedMainTitle"></div>
<!-- report list -->
<div class="mb-5" id="report-form"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/reportList.html
......@@ -40,13 +40,15 @@
<div id="loader" style="display: none;"></div>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<div id="loadingNone" style="display:none;">
<div id="includedMainTitle"></div>
<!-- report list -->
<div class="container-wrap mb-5" id="reportList"></div>
<!-- report list -->
<div class="container-wrap mb-5" id="reportList"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/html/sendMessage.html
......@@ -40,57 +40,59 @@
<body>
<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 id="loadingNone" style="display:none;">
<!-- 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>
</div>
</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 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>
</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 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>
<textarea name="message-content" class="form-control" id="messageContent" cols="30" rows="10"></textarea>
</div>
</form>
</form>
</div>
</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>
</div>
</main>
</div>
</main>
<!-- task list modal -->
<div id="includeOperationSelect"></div>
<!-- task list modal -->
<div id="includeOperationSelect"></div>
<!-- select template modal -->
<div id="includeTemplateModal"></div>
<!-- select template modal -->
<div id="includeTemplateModal"></div>
</div>
<script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
......
abweb/js/reportForm/reportForm.js
......@@ -14,12 +14,12 @@ RF.addReportFlg;
RF.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
COMMON.checkQuickReport(function(result) {
COMMON.checkQuickReport(function (result) {
if (result) {
result.isQuickReport = RF.isQuickReport;
result.addReportFlg = RF.addReportFlg;
}
})
});
RF.loadCommon();
RF.initFormView();
};
......@@ -38,7 +38,7 @@ RF.loadCommon = function () {
*/
RF.initBreadcrumb = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
......@@ -49,10 +49,10 @@ RF.initBreadcrumb = function () {
href: CONSTANT.URL_TREE_NAME.PICKUP_CONTINUOS,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
} else if (sessionStorage.getItem("pickUpType") == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
];
} else if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
......@@ -63,9 +63,9 @@ RF.initBreadcrumb = function () {
href: CONSTANT.URL_TREE_NAME.PICKUP_WARNING,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
} else {
navs = [
{
......@@ -78,17 +78,17 @@ RF.initBreadcrumb = function () {
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST
href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
}
} else {
if (sessionStorage.getItem("pickUpType")) sessionStorage.removeItem("pickUpType");
if (sessionStorage.getItem('pickUpType')) sessionStorage.removeItem('pickUpType');
if ((RF.addReportFlg) && RF.addReportFlg == 1) {
if (RF.addReportFlg && RF.addReportFlg == 1) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
......@@ -96,12 +96,12 @@ RF.initBreadcrumb = function () {
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST
href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
} else {
navs = [
{
......@@ -109,17 +109,17 @@ RF.initBreadcrumb = function () {
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
]
];
}
}
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, RF.loadMainTitleCallback);
}
};
/**
* load main title callcack
*/
/**
* load main title callcack
*/
RF.loadMainTitleCallback = function () {
//add dashboard setting item
if (RF.isQuickReport) {
......@@ -163,3 +163,22 @@ RF.initFormView = function () {
COMMON.avwScreenMove('index.html');
}
};
/**
* back page url
*/
RF.backPage = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (addReportFlg == 1) {
COMMON.avwScreenMove('reportList.html');
} else {
COMMON.avwScreenMove('pickup.html');
}
} else {
if (addReportFlg == 1) {
COMMON.avwScreenMove('reportList.html');
} else {
COMMON.avwScreenMove('index.html');
}
}
};
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