Skip to content

C
check
Commit 1379d2c6 by NGUYEN THI MY DUYEN
Options

update index.html

parent faa0e2e7
Showing with 473 additions and 158 deletions
abweb/common/category-modal.html 0 → 100644
<div class="modal fade" id="category-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable overflow-auto" role="document">
<div class="modal-content">
<div class="modal-header bg-dark10">
<h5 class="modal-title">カテゴリー選択</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<ul class="list-menu">
<ul>
<li>
<label>
<input type="radio" name="category" checked>
<span>すべて</span>
</label>
</li>
</ul>
<li class="accordion" id="accordion1">
<div id="heading1">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1" aria-expanded="true" aria-controls="collapse1">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>全社</span>
</label>
</a>
</div>
<div id="collapse1" class="collapse" aria-labelledby="heading1" data-parent="#accordion1">
<ul>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
<li class="accordion" id="accordion1-1">
<div id="heading1-1">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-1" aria-expanded="true" aria-controls="collapse1-1">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-1" class="collapse" aria-labelledby="heading1-1" data-parent="#accordion1-1">
<ul>
<li class="accordion" id="accordion1-2">
<div id="heading1-2">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-2" aria-expanded="true" aria-controls="collapse1-2">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-2" class="collapse" aria-labelledby="heading1-2" data-parent="#accordion1-2">
<ul>
<li class="accordion" id="accordion1-3">
<div id="heading1-3">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-3" aria-expanded="true" aria-controls="collapse1-3">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-3" class="collapse" aria-labelledby="heading1-3" data-parent="#accordion1-3">
<ul>
<li class="accordion" id="accordion1-4">
<div id="heading1-4">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-4" aria-expanded="true" aria-controls="collapse1-4">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-4" class="collapse" aria-labelledby="heading1-4" data-parent="#accordion1-4">
<ul>
<li class="accordion" id="accordion1-5">
<div id="heading1-5">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-5" aria-expanded="true" aria-controls="collapse1-5">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-5" class="collapse" aria-labelledby="heading1-5" data-parent="#accordion1-5">
<ul>
<li class="accordion" id="accordion1-6">
<div id="heading1-6">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-6" aria-expanded="true" aria-controls="collapse1-6">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-6" class="collapse" aria-labelledby="heading1-6" data-parent="#accordion1-6">
<ul>
<li class="accordion" id="accordion1-7">
<div id="heading1-7">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-7" aria-expanded="true" aria-controls="collapse1-7">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-7" class="collapse" aria-labelledby="heading1-7" data-parent="#accordion1-7">
<ul>
<li class="accordion" id="accordion1-8">
<div id="heading1-8">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-8" aria-expanded="true" aria-controls="collapse1-8">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-8" class="collapse" aria-labelledby="heading1-8" data-parent="#accordion1-8">
<ul>
<li class="accordion" id="accordion1-9">
<div id="heading1-9">
<a href="#" class="list-menu-link">
<button type="button" class="collapsed" data-toggle="collapse" data-target="#collapse1-9" aria-expanded="true" aria-controls="collapse1-9">
<div class="arrow-icon"></div>
</button>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</a>
</div>
<div id="collapse1-9" class="collapse" aria-labelledby="heading1-9" data-parent="#accordion1-9">
<ul>
<li>
<label>
<input type="radio" name="category">
<span>カテゴリー</span>
</label>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
</li>
</ul>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary">選択</button>
<button type="button" class="btn btn-tertiary" data-dismiss="modal">キャンセル</button>
</div>
</div>
</div>
</div>
abweb/common/css/newdash/app.css
...@@ -20689,7 +20689,7 @@ button { ...@@ -20689,7 +20689,7 @@ button {
.type-icon .report:before{ .type-icon .report:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_report.svg"); background-image: url("../../../common/img/type_icon_report.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20699,7 +20699,7 @@ button { ...@@ -20699,7 +20699,7 @@ button {
} }
.type-icon .questionary:before{ .type-icon .questionary:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_questionary.svg"); background-image: url("../../../common/img/type_icon_questionary.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20709,7 +20709,7 @@ button { ...@@ -20709,7 +20709,7 @@ button {
} }
.type-icon .inspection:before{ .type-icon .inspection:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_inspection.svg"); background-image: url("../../../common/img/type_icon_inspection.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20719,7 +20719,7 @@ button { ...@@ -20719,7 +20719,7 @@ button {
} }
.type-icon .proccess:before{ .type-icon .proccess:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_proccess.svg"); background-image: url("../../../common/img/type_icon_proccess.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
......
abweb/common/img/type_icon_questionary.svg deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?><svg id="_レイヤー_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 119.14 125"><defs><style>.cls-1{fill:#a5d6a7;}</style></defs><g id="_レイヤー_1-2"><g><path class="cls-1" d="M48.17,121.12H9.29c-2.48,0-4.65-.93-6.5-2.79-1.86-1.86-2.79-4.03-2.79-6.5V21.68c0-2.48,.8-4.65,2.4-6.5,1.6-1.86,2.97-2.79,4.1-2.79h31.29c.72-3.61,2.5-6.58,5.34-8.91C45.97,1.16,49.25,0,52.97,0c3.72,0,7,1.16,9.83,3.48,2.84,2.32,4.62,5.29,5.34,8.91h31.29c2.48,0,4.65,.93,6.5,2.79,1.86,1.86,2.79,4.03,2.79,6.5v31.44h-9.29V21.68h-16.42v10.84c0,2.58-.9,4.78-2.71,6.58-1.81,1.81-4,2.71-6.58,2.71H35c-2.58,0-4.78-.9-6.58-2.71-1.81-1.81-2.71-4-2.71-6.58v-10.84H9.29V111.82H48.17v9.29Zm-13.4-55.34l16.51-16.51c.45-.45,.98-.67,1.59-.64,.61,.03,1.14,.27,1.59,.72s.68,1,.68,1.63-.23,1.17-.68,1.63l-18.1,18.1c-.45,.45-.98,.68-1.59,.68s-1.14-.23-1.59-.68l-8.94-8.94c-.45-.45-.67-1-.64-1.63,.03-.63,.27-1.17,.72-1.63,.45-.45,1-.68,1.63-.68,.63,0,1.17,.23,1.63,.68l7.2,7.27Zm0,26l16.51-16.51c.45-.45,.98-.67,1.59-.64,.61,.03,1.14,.27,1.59,.72s.68,1,.68,1.63-.23,1.17-.68,1.63l-18.1,18.1c-.45,.45-.98,.68-1.59,.68s-1.14-.23-1.59-.68l-8.94-8.94c-.45-.45-.67-1-.64-1.63,.03-.63,.27-1.17,.72-1.63,.45-.45,1-.68,1.63-.68,.63,0,1.17,.23,1.63,.68l7.2,7.27ZM55.76,21.06c1.76,0,3.23-.59,4.41-1.78,1.19-1.19,1.78-2.66,1.78-4.41s-.59-3.23-1.78-4.41c-1.19-1.19-2.66-1.78-4.41-1.78s-3.23,.59-4.41,1.78c-1.19,1.19-1.78,2.66-1.78,4.41s.59,3.23,1.78,4.41c1.19,1.19,2.66,1.78,4.41,1.78Z"/><g><path class="cls-1" d="M113.09,82.66l-11.61-11.61,4.74-4.74c.87-.87,2.02-1.31,3.43-1.31s2.56,.44,3.43,1.31l4.74,4.74c.87,.87,1.31,2.02,1.31,3.43s-.44,2.56-1.31,3.43l-4.74,4.74Z"/><path class="cls-1" d="M59.14,122.55v-7.19c0-.65,.11-1.25,.33-1.8,.22-.54,.6-1.09,1.14-1.63l33.84-33.84,11.61,11.61-33.84,33.84c-.54,.54-1.09,.93-1.63,1.14-.54,.22-1.14,.33-1.8,.33h-7.19c-.65,0-1.23-.25-1.72-.74-.49-.49-.74-1.06-.74-1.72Z"/></g></g></g></svg>
\ No newline at end of file
abweb/common/js/header.js 0 → 100644
/**
* header js for index.
* ※Code is written mainly for dashboard and operationList.
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
var HEADER = {};
/** Direct home page setting */
HEADER.goToHomePage = function (pageId) {
DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1)
{
HEADER.goDashboard();
}
else
{
HEADER.goOperationList();
}
});
}
/**
* Go page of operationList
*/
HEADER.goOperationList = function () {
OL.init();
};
/**
* Go page of dashboard
*/
HEADER.goDashboard = function () {
COMMON.avwScreenMove("dashboard.html");
};
/**
* Initialize with any navigation
*
* @param {String} bottomNav
*/
HEADER.activeInitBottomNav = function (bottomNav) {
HEADER.inactiveAllBottomNav();
HEADER.activeBottomNav(bottomNav);
};
/**
* change inactive all footer bottom
*/
HEADER.inactiveAllBottomNav = function () {
let navs = document.getElementsByClassName('bottom-nav');
for (i = 0; i < navs.length; i++) {
navs[i].className = navs[i].className.replace('text-primary', 'text-secondary');
let img = navs[i].querySelector('img');
if (img && img.getAttribute('data-inactive-src')) {
img.src = img.getAttribute('data-inactive-src');
}
}
};
/**
* Change specific footer bottom to active.
*
* @param {String} bottomNavId
*/
HEADER.activeBottomNav = function (bottomNavId) {
let elm = $('#' + bottomNavId);
if (typeof elm !== 'object') {
console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId);
return;
}
elm.removeClass('text-secondary');
elm.addClass('text-primary');
let img = elm.find('img')[0];
if (img && img.getAttribute('data-src')) {
img.src = img.getAttribute('data-src');
}
};
\ No newline at end of file
abweb/html/index.html
...@@ -3,34 +3,36 @@ ...@@ -3,34 +3,36 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title calss="multi-lang" data-msg="operationListTitle"></title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="A Book Check"> <!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/header.css"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/footer.css"> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/newdash/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/newdash/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/fontawesome_relative_path.css"> <link rel="stylesheet" type="text/css" href="../common/css/newdash/style.css">
<!-- vender css -->
<script src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script> <link rel="stylesheet" type="text/css" href="../common/css/newdash/fontawesome_relative_path.css">
<script src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<!-- <script src="../common/js/web/common.js?__UPDATEID__"></script> <script type="text/javascript" src="/abweb/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script src="../common/js/web/avweb.js?__UPDATEID__"></script> --> <script type="text/javascript" src="/abweb/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abweb/common/js/web/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../js/operationList/operationList.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../js/dashboardSetting/check-dashboard-setting.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script src="../common/js/footer.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script type="text/javascript" src="../js/topPage/topPage.js"></script>
<script type="text/javascript" src="../js/operationList/operationList.js"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script> <script src="../common/js/app.js?__UPDATEID__" defer></script>
</head> </head>
<body onload="TOP.init();" style="position: relative; margin-top: 53px;">
<body> <body>
<!-- header --> <!-- header -->
...@@ -75,59 +77,33 @@ ...@@ -75,59 +77,33 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group p-2 mb-0">
<label>終了日</label>
<div class="input-group date" id="datetimepicker2" data-target-input="nearest">
<input type="text" name="end" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" placeholder="選択" id="searchEndDate">
<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
<div class="input-group-text py-1 px-2">
<img src="../common/img/icon_calendar.svg" alt="カレンダー" class="calendar-icon">
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="mask hide"></div>
</div> </div>
<div class="dropdown">
<!--ソート--> <a href="#" class="mx-1" id="dropdown-term" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-120, 0">
<div class="col-4 col-md-5 col-lg-6 text-right"> <img class="serarch-icon" src="../common/img/icon_swap.svg" alt="並び替え" data-toggle="tooltip" data-placement="bottom" title="並び替え">
<a href="#" class="text-decoration-none py-2 lht-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-120, 0">
<img class="icon" src="../img/operationList/icon_swap.svg">
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelSort"></span>
</a>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortName" data-sort="0" onclick="OL.changeSortType(this);"></a>
<a class="dropdown-item sort-type active multi-lang" data-msg="labelSortNew" data-sort="1" id="defaultSort" onclick="OL.changeSortType(this);"></a>
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortOld" data-sort="2" onclick="OL.changeSortType(this);"></a>
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortOpen" data-sort="4" onclick="OL.changeSortType(this);"></a>
</div>
<a href="javascript:OL.resetSearch();" class="text-decoration-none py-2 lht-0 d-inline-block ml-3">
<img class="icon" src="../img/operationList/icon_clear.svg">
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelReset" lnag="labelReset"></span>
</a> </a>
<div class="dropdown-menu dropdown-menu-right sort" data-animation="true" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#" data-sort="0" onclick="OL.changeSortType(this);">作業名順</a>
<a class="dropdown-item active" href="#" data-sort="1" id="defaultSort" onclick="OL.changeSortType(this);">新しい順</a>
<a class="dropdown-item" href="#" data-sort="2" onclick="OL.changeSortType(this);">古い順</a>
<a class="dropdown-item" href="#" data-sort="4" onclick="OL.changeSortType(this);">閲覧日順</a>
</div> </div>
</div> </div>
</nav> <a href="javascript:OL.resetSearch();" class="mx-1">
<img class="serarch-icon" src="../common/img/icon_close.svg" alt="クリア" data-toggle="tooltip" data-placement="bottom" title="検索条件をクリア">
<!--一覧表示-->
<section>
<table class="table">
<thead>
<tr>
<th class="multi-lang" data-msg="headerItemName"></th>
<th class="d-none d-md-table-cell multi-lang" data-msg="headerStartDate"></th>
<th class="d-none d-md-table-cell multi-lang" data-msg="headerEndDate"></th>
</tr>
</thead>
<tbody id="operationTable">
</tbody>
</table>
</section>
</main>
</section>
</section>
<section id="dashboard" class="page-content" style="display: none;">
<header>
<nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100">
<div></div>
<h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang alignCenter_header" data-msg="dashboardHeaderTitle"></h1>
<div class="d-flex align-items-center">
<a href="javascript:CHK.goUrlWithCurrentParams('dashboard-setting.html');" class="nav-link text-white lht-0 p-1 mr-2">
<img class="icon" src="../img/dashboard/icon_dashboard_setting.svg" alt="">
<span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonDashboardSetting"></span>
</a> </a>
</div> </div>
</nav> </nav>
...@@ -176,8 +152,7 @@ ...@@ -176,8 +152,7 @@
<!--ローディング--> <!--ローディング-->
<div id="check_loading" style="display:none; position: relative; overflow:hidden;"> <div id="check_loading" style="display:none; position: relative; overflow:hidden;">
<p id="checkLoadingMessage"></p> <p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='${check}images/transferLoading.gif' /></div> <div id="checkLoadingImage"><img src='######' /></div>
</div> </div>
</body> </body>
......
abweb/js/operationList/operationList.js
...@@ -5,29 +5,29 @@ ...@@ -5,29 +5,29 @@
* @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 OL = {}; var OL = {};
OL.operationList; //Operation json data OL.operationList; //Operation json data
OL.operationGroupMaster; //category(operationGroupMaster) json data OL.operationGroupMaster; //category(operationGroupMaster) json data
OL.isOperationGroupMaster = 0; //0: category(operationGroupMaster) not exist 1: category(operationGroupMaster) exist OL.isOperationGroupMaster = 0; //0: category(operationGroupMaster) not exist 1: category(operationGroupMaster) exist
OL.sortIndex; OL.sortIndex;
OL.operationGroupMasterId; OL.operationGroupMasterId;
OL.REPORT_TYPE = { OL.REPORT_TYPE = {
REPORTONLY: 0, //report only REPORTONLY: 0, //report only
INSPECT: 1, //rountine INSPECT: 1, //rountine
WITHREPLY: 2, // report answer WITHREPLY: 2, // report answer
WORKFLOW: 3 // continuous WORKFLOW: 3 // continuous
} }
/** /**
* process on page load. * process on page load.
* 1.get all data. * 1.get all data.
* 2.show operationList. * 2.show operationList.
* 3.show category(operationGroupMaster). * 3.show category(operationGroupMaster).
*/ */
OL.init = function () { OL.init = function () {
console.log('OperationList start'); console.log('OperationList start');
TEMPLATE.loadHearder("#includedHeader"); TEMPLATE.loadHearder("#includedHeader");
...@@ -42,9 +42,9 @@ OL.init = function () { ...@@ -42,9 +42,9 @@ OL.init = function () {
//show category(operationGroupMaster) //show category(operationGroupMaster)
OL.createCategory(); OL.createCategory();
}; };
/** /**
* get operation list all data * get operation list all data
* 1.operation list * 1.operation list
* 2.category(operationGroupMaster) list * 2.category(operationGroupMaster) list
...@@ -55,7 +55,7 @@ OL.init = function () { ...@@ -55,7 +55,7 @@ OL.init = function () {
* @param {String} searchEndDate * @param {String} searchEndDate
* @param {Number} operationGroupMasterId * @param {Number} operationGroupMasterId
*/ */
OL.getAllDataWeb = function (searchKeyWord, sortIndex, searchStartDate, searchEndDate, operationGroupMasterId) { OL.getAllDataWeb = function (searchKeyWord, sortIndex, searchStartDate, searchEndDate, operationGroupMasterId) {
let param = {}; let param = {};
param.sid = COMMON.getSid(); param.sid = COMMON.getSid();
if (typeof searchKeyWord !== 'undefined') { if (typeof searchKeyWord !== 'undefined') {
...@@ -83,9 +83,9 @@ OL.getAllDataWeb = function (searchKeyWord, sortIndex, searchStartDate, searchEn ...@@ -83,9 +83,9 @@ OL.getAllDataWeb = function (searchKeyWord, sortIndex, searchStartDate, searchEn
OL.operationGroupMaster = json.operationGroupMasterList; OL.operationGroupMaster = json.operationGroupMasterList;
OL.isOperationGroupMaster = json.isOperationGroupMaster; OL.isOperationGroupMaster = json.isOperationGroupMaster;
}); });
}; };
/** /**
* Transfer search criteria to session. * Transfer search criteria to session.
* Keep value after page move. * Keep value after page move.
* *
...@@ -95,7 +95,7 @@ OL.getAllDataWeb = function (searchKeyWord, sortIndex, searchStartDate, searchEn ...@@ -95,7 +95,7 @@ OL.getAllDataWeb = function (searchKeyWord, sortIndex, searchStartDate, searchEn
* @param {String} searchEndDate * @param {String} searchEndDate
* @param {String} operationGroupMasterId * @param {String} operationGroupMasterId
*/ */
OL.saveSearchKeyWord = function (searchKeyword, sortIndex, searchStartDate, searchEndDate, operationGroupMasterId) { OL.saveSearchKeyWord = function (searchKeyword, sortIndex, searchStartDate, searchEndDate, operationGroupMasterId) {
if (typeof searchKeyword !== 'undefined') { if (typeof searchKeyword !== 'undefined') {
sessionStorage.OL_searchKeyWord = searchKeyword; sessionStorage.OL_searchKeyWord = searchKeyword;
} }
...@@ -111,12 +111,12 @@ OL.saveSearchKeyWord = function (searchKeyword, sortIndex, searchStartDate, sear ...@@ -111,12 +111,12 @@ OL.saveSearchKeyWord = function (searchKeyword, sortIndex, searchStartDate, sear
if (typeof operationGroupMasterId !== 'undefined') { if (typeof operationGroupMasterId !== 'undefined') {
sessionStorage.OL_operationGroupMasterId = operationGroupMasterId; sessionStorage.OL_operationGroupMasterId = operationGroupMasterId;
} }
}; };
/** /**
* set search criteria when Initial display. * set search criteria when Initial display.
*/ */
OL.setSearchInfoWeb = function () { OL.setSearchInfoWeb = function () {
if (sessionStorage.OL_sortIndex) { if (sessionStorage.OL_sortIndex) {
OL.sortIndex = sessionStorage.OL_sortIndex; OL.sortIndex = sessionStorage.OL_sortIndex;
} }
...@@ -132,12 +132,12 @@ OL.setSearchInfoWeb = function () { ...@@ -132,12 +132,12 @@ OL.setSearchInfoWeb = function () {
if (sessionStorage.OL_operationGroupMasterId) { if (sessionStorage.OL_operationGroupMasterId) {
OL.operationGroupMasterId = sessionStorage.OL_operationGroupMasterId; OL.operationGroupMasterId = sessionStorage.OL_operationGroupMasterId;
} }
}; };
/** /**
* create operation list * create operation list
*/ */
OL.createOperationList = function (operationList) { OL.createOperationList = function (operationList) {
//Initialization //Initialization
OL.initActiveSortIndex(); OL.initActiveSortIndex();
$('#operationTable').empty(); $('#operationTable').empty();
...@@ -179,29 +179,31 @@ OL.createOperationList = function (operationList) { ...@@ -179,29 +179,31 @@ OL.createOperationList = function (operationList) {
+ "<span class='" + classIcon + "'></span>" + "<span class='" + classIcon + "'></span>"
+ "</div></div>") + "</div></div>")
let divDate = "<div class='fs-8 text-secondary text-truncate'>"
+ OL.setOperationDate(operationList[i].operationStartDate)
+ ' ~ '
+ OL.setOperationDate(operationList[i].operationEndDate)
+ "</div>";
let divText = $("<div class='pl-5 h-100 d-flex align-items-center'>" let divText = $("<div class='pl-5 h-100 d-flex align-items-center'>"
+ "<div class='w-100'>" + "<div class='w-100'>"
+ "<div class='fs-12 text-truncate'>" + operationList[i].operationName + "</div>" + "<div class='fs-12 text-truncate'>" + operationList[i].operationName + "</div>"
+ divDate
+ "</div></div>"); + "</div></div>");
let divDate = $("<div class='fs-8 text-secondary text-truncate'>"
+ OL.setOperationDate(operationList[i].operationStartDate)
+ ' ~ '
+ OL.setOperationDate(operationList[i].operationEndDate)
+ "</div>");
ahrefRequiredFlg.append(divIcon); ahrefRequiredFlg.append(divIcon);
ahrefRequiredFlg.append(divText); ahrefRequiredFlg.append(divText);
messageli.append(ahrefRequiredFlg); messageli.append(ahrefRequiredFlg);
$('#operationTable').append(messageli); $('#operationTable').append(messageli);
} }
}; };
/** /**
* add color to any sorting type when sortIndex exsist * add color to any sorting type when sortIndex exsist
* *
* @param {Number} sortIndex * @param {Number} sortIndex
*/ */
OL.initActiveSortIndex = function (sortIndex) { OL.initActiveSortIndex = function (sortIndex) {
if (!sortIndex && !OL.sortIndex) { if (!sortIndex && !OL.sortIndex) {
OL.sortIndex = CONSTANT.SORT_TYPE.START_DATE_DESC; OL.sortIndex = CONSTANT.SORT_TYPE.START_DATE_DESC;
} }
...@@ -213,23 +215,23 @@ OL.initActiveSortIndex = function (sortIndex) { ...@@ -213,23 +215,23 @@ OL.initActiveSortIndex = function (sortIndex) {
$(this).addClass('active'); $(this).addClass('active');
} }
}); });
}; };
/** /**
* set date for OperationList * set date for OperationList
* *
* @param {String} date * @param {String} date
* @returns operationDate * @returns operationDate
*/ */
OL.setOperationDate = function (date) { OL.setOperationDate = function (date) {
const operationDate = date.replace(/-/g, '/').substring(0, 10); const operationDate = date.replace(/-/g, '/').substring(0, 10);
return operationDate; return operationDate;
}; };
/** /**
* create category(operationGroupMaster). * create category(operationGroupMaster).
*/ */
OL.createCategory = function () { OL.createCategory = function () {
if (!OL.isOperationGroupMaster) { if (!OL.isOperationGroupMaster) {
return; return;
} }
...@@ -238,12 +240,12 @@ OL.createCategory = function () { ...@@ -238,12 +240,12 @@ OL.createCategory = function () {
OL.createBreadcrumbList(); OL.createBreadcrumbList();
OL.createCategoryList(); OL.createCategoryList();
OL.acdMenu(); OL.acdMenu();
}; };
/** /**
* Initial processing of category(operationGroupMaster). * Initial processing of category(operationGroupMaster).
*/ */
OL.initCategory = function () { OL.initCategory = function () {
if (!OL.isOperationGroupMaster) { if (!OL.isOperationGroupMaster) {
return; return;
} }
...@@ -253,22 +255,22 @@ OL.initCategory = function () { ...@@ -253,22 +255,22 @@ OL.initCategory = function () {
$(window).resize(function () { $(window).resize(function () {
OL.setCategoryHeight(); OL.setCategoryHeight();
}); });
}; };
/** /**
* change height category(operationGroupMaster) * change height category(operationGroupMaster)
*/ */
OL.setCategoryHeight = function () { OL.setCategoryHeight = function () {
const CATEGORY_HEIGHT = $('footer').offset().top - $('#category-menu').offset().top; const CATEGORY_HEIGHT = $('footer').offset().top - $('#category-menu').offset().top;
$('#category-menu').css('overflow', 'scroll'); $('#category-menu').css('overflow', 'scroll');
$('#category-menu').height(CATEGORY_HEIGHT); $('#category-menu').height(CATEGORY_HEIGHT);
$('#overlayDiv').height(CATEGORY_HEIGHT); $('#overlayDiv').height(CATEGORY_HEIGHT);
}; };
/** /**
* create Breadcrumb List * create Breadcrumb List
*/ */
OL.createBreadcrumbList = function () { OL.createBreadcrumbList = function () {
if (!OL.isOperationGroupMaster) { if (!OL.isOperationGroupMaster) {
return; return;
} }
...@@ -289,16 +291,16 @@ OL.createBreadcrumbList = function () { ...@@ -289,16 +291,16 @@ OL.createBreadcrumbList = function () {
); );
}); });
} }
}; };
/** /**
* create Breadcrumb tree List * create Breadcrumb tree List
* *
* @param {list} treeList * @param {list} treeList
* @param {string} operationGroupMasterId * @param {string} operationGroupMasterId
* @returns * @returns
*/ */
OL.createBreadcrumbTree = function (treeList, operationGroupMasterId) { OL.createBreadcrumbTree = function (treeList, operationGroupMasterId) {
if (operationGroupMasterId == 0) { if (operationGroupMasterId == 0) {
return treeList; return treeList;
} }
...@@ -307,12 +309,12 @@ OL.createBreadcrumbTree = function (treeList, operationGroupMasterId) { ...@@ -307,12 +309,12 @@ OL.createBreadcrumbTree = function (treeList, operationGroupMasterId) {
OL.createBreadcrumbTree(treeList, groupMaster.parentOperationGroupMasterId); OL.createBreadcrumbTree(treeList, groupMaster.parentOperationGroupMasterId);
treeList.push(groupMaster); treeList.push(groupMaster);
return treeList; return treeList;
}; };
/** /**
* create category(operationGroupMaster) structure * create category(operationGroupMaster) structure
*/ */
OL.createCategoryList = function () { OL.createCategoryList = function () {
if (!OL.isOperationGroupMaster) { if (!OL.isOperationGroupMaster) {
return; return;
} }
...@@ -375,12 +377,12 @@ OL.createCategoryList = function () { ...@@ -375,12 +377,12 @@ OL.createCategoryList = function () {
} }
} }
} }
}; };
/** /**
* Open/close category(operationGroupMaster) drawer menu * Open/close category(operationGroupMaster) drawer menu
*/ */
OL.acdMenu = function () { OL.acdMenu = function () {
//Hide accordion contents by default //Hide accordion contents by default
$('.drawer-menu dd').css('display', 'none'); $('.drawer-menu dd').css('display', 'none');
$('.drawer-menu2 ul').css('display', 'none'); $('.drawer-menu2 ul').css('display', 'none');
...@@ -397,14 +399,14 @@ OL.acdMenu = function () { ...@@ -397,14 +399,14 @@ OL.acdMenu = function () {
$('.sub-menu-ttl').not($(this)).not($(this).parents().siblings('p')).removeClass('openAcd').next().slideUp('fast'); $('.sub-menu-ttl').not($(this)).not($(this).parents().siblings('p')).removeClass('openAcd').next().slideUp('fast');
$(this).toggleClass('openAcd').next().slideToggle('fast'); $(this).toggleClass('openAcd').next().slideToggle('fast');
}); });
}; };
/** /**
* Sort the operationList by screen operation * Sort the operationList by screen operation
* *
* @param {Object} sortType * @param {Object} sortType
*/ */
OL.changeSortType = function (sortType) { OL.changeSortType = function (sortType) {
$('.sort-type').removeClass('active'); $('.sort-type').removeClass('active');
$(sortType).addClass('active'); $(sortType).addClass('active');
OL.sortIndex = $(sortType).attr('data-sort'); OL.sortIndex = $(sortType).attr('data-sort');
...@@ -412,15 +414,15 @@ OL.changeSortType = function (sortType) { ...@@ -412,15 +414,15 @@ OL.changeSortType = function (sortType) {
const sortNumber = parseFloat(sortStr); const sortNumber = parseFloat(sortStr);
OL.sortOperationList(sortNumber); OL.sortOperationList(sortNumber);
OL.createOperationList(OL.operationList); OL.createOperationList(OL.operationList);
}; };
/** /**
* sort the operationList * sort the operationList
* *
* @param {Number} sortNumber * @param {Number} sortNumber
*/ */
OL.sortOperationList = function (sortNumber) { OL.sortOperationList = function (sortNumber) {
switch (sortNumber) { switch (sortNumber) {
case CONSTANT.SORT_TYPE.NAME: case CONSTANT.SORT_TYPE.NAME:
OL.operationList.sort(function (a, b) { OL.operationList.sort(function (a, b) {
...@@ -466,12 +468,12 @@ OL.sortOperationList = function (sortNumber) { ...@@ -466,12 +468,12 @@ OL.sortOperationList = function (sortNumber) {
}); });
break; break;
} }
}; };
/** /**
* 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();
...@@ -487,49 +489,49 @@ OL.search = function () { ...@@ -487,49 +489,49 @@ OL.search = function () {
OL.createOperationList(OL.operationList); OL.createOperationList(OL.operationList);
OL.createCategory(); OL.createCategory();
COMMON.closeLoading(); COMMON.closeLoading();
}; };
/** /**
* change the operationList by select the category(OperationGroupMaster) * change the operationList by select the category(OperationGroupMaster)
* @param {Number} operationGroupMasterId * @param {Number} operationGroupMasterId
*/ */
OL.changeOperationGroupMaster = function (operationGroupMasterId) { OL.changeOperationGroupMaster = function (operationGroupMasterId) {
if ($('#category-menu').hasClass('open')) { if ($('#category-menu').hasClass('open')) {
$('#category-toggle-button').click(); $('#category-toggle-button').click();
$('body').css('overflow', 'visible'); $('body').css('overflow', 'visible');
} }
OL.operationGroupMasterId = operationGroupMasterId; OL.operationGroupMasterId = operationGroupMasterId;
OL.search(); OL.search();
}; };
/** /**
* open the category(OperationGroupMaster) * open the category(OperationGroupMaster)
*/ */
OL.openCategory = function () { OL.openCategory = function () {
window.scrollTo(0, 0); window.scrollTo(0, 0);
if ($('#category-menu').hasClass('open')) { if ($('#category-menu').hasClass('open')) {
$('body').css('overflow', 'visible'); $('body').css('overflow', 'visible');
} else { } else {
$('body').css('overflow', 'hidden'); $('body').css('overflow', 'hidden');
} }
}; };
/** /**
* reset search * reset search
*/ */
OL.resetSearch = function () { OL.resetSearch = function () {
$('#searchTaskName').val(''); $('#searchTaskName').val('');
$('#searchStartDate').val(''); $('#searchStartDate').val('');
$('#searchEndDate').val(''); $('#searchEndDate').val('');
OL.changeSortType($('#defaultSort')); OL.changeSortType($('#defaultSort'));
}; };
/** /**
* Transition to the report form or operation list screen * Transition to the report form or operation list screen
* *
* @param {String} operationId * @param {String} operationId
*/ */
OL.sendOperation = function (operationId, operationType, reportType, enableAddReport) { OL.sendOperation = function (operationId, operationType, reportType, enableAddReport) {
//save operation logs. needed for sorting //save operation logs. needed for sorting
OL.saveOperationReadingLog(operationId, operationType, reportType); OL.saveOperationReadingLog(operationId, operationType, reportType);
...@@ -537,18 +539,19 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe ...@@ -537,18 +539,19 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
const url = OL.createUrlOfOperation(enableAddReport, reportType); const url = OL.createUrlOfOperation(enableAddReport, reportType);
COMMON.postCommunication(url, params); COMMON.postCommunication(url, params);
}; };
/** /**
* save operation logs. needed for sorting * save operation logs. needed for sorting
* *
* @param {String} operationId * @param {String} operationId
* @param {String} operationType * @param {String} operationType
* @param {String} reportType * @param {String} reportType
*/ */
OL.saveOperationReadingLog = function (operationId, operationType, reportType) { OL.saveOperationReadingLog = function (operationId, operationType, reportType) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
...@@ -558,20 +561,21 @@ OL.saveOperationReadingLog = function (operationId, operationType, reportType) { ...@@ -558,20 +561,21 @@ OL.saveOperationReadingLog = function (operationId, operationType, reportType) {
params.viewingStartDate = COMMON.currentTime(); params.viewingStartDate = COMMON.currentTime();
const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + CONSTANT.URL.CMS.API.OPERATION_VIEW_LOG; const url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.API.BASE + CONSTANT.URL.CMS.API.OPERATION_VIEW_LOG;
COMMON.cmsAjax(url, params, false); COMMON.cmsAjax(url, params, false);
}; };
/** /**
* return url of cms Operation Scene * return url of cms Operation Scene
* *
* @param {boolean} enableAddReport * @param {boolean} enableAddReport
* @param {Number} reportType * @param {Number} reportType
* @returns url * @returns url
*/ */
OL.createUrlOfOperation = function (enableAddReport, reportType) { OL.createUrlOfOperation = function (enableAddReport, reportType) {
let baseUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE; let baseUrl = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE;
if (reportType == CONSTANT.REPORT_TYPE.ROUTINE || enableAddReport == '1') { if (reportType == CONSTANT.REPORT_TYPE.ROUTINE || enableAddReport == '1') {
return baseUrl + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST; return baseUrl + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
} else { } else {
return baseUrl + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT; return baseUrl + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
} }
}; };
\ No newline at end of file
abweb/js/topPage/topPage.js
...@@ -16,6 +16,8 @@ $(document).ready(function () { ...@@ -16,6 +16,8 @@ $(document).ready(function () {
//setting msg of html //setting msg of html
COMMON.updateLang(); COMMON.updateLang();
TOP.init();
}); });
/** /**
...@@ -23,7 +25,7 @@ $(document).ready(function () { ...@@ -23,7 +25,7 @@ $(document).ready(function () {
*/ */
TOP.init = function () { TOP.init = function () {
COMMON.showLoading(); COMMON.showLoading();
FOOTER.initFooter(); //app should get data after initFooter HEADER.goToHomePage(); //app should get data after initFooter
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