Skip to content

C
check
Commit 1e8bc0f0 by NGUYEN HOANG SON
Options

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

# Conflicts:
#	abweb/common/js/header.js
#	abweb/common/json/lang/lang-en.json
#	abweb/common/json/lang/lang-ja.json
#	abweb/common/json/lang/lang-ko.json
#	abweb/html/common/header.html
#	abweb/html/index.html
#	abweb/js/operationList/operationList.js
parents fa6228f6 ac475e82
Showing with 913 additions and 646 deletions
abweb/common/css/newdash/app.css
...@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{ ...@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{
} }
.select-card-list .arrow-icon { .select-card-list .arrow-icon {
background-image: url("../img/icon_arrow_down.svg"); background-image: url("/abweb/common/img/icon_arrow_down.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
width: 14px; width: 14px;
...@@ -20590,7 +20590,7 @@ button { ...@@ -20590,7 +20590,7 @@ button {
list-style: none; list-style: none;
} }
.list-menu button .arrow-icon{ .list-menu button .arrow-icon{
background-image: url("../img/icon_arrow_right.svg"); background-image: url("/abweb/common/img/icon_arrow_right.svg");
background-size: contain; background-size: contain;
width: 17px; width: 17px;
height: 17px; height: 17px;
...@@ -20689,7 +20689,7 @@ button { ...@@ -20689,7 +20689,7 @@ button {
.type-icon .report:before{ .type-icon .report:before{
content: ''; content: '';
background-image: url("../img/type_icon_report.svg"); background-image: url("/abweb/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("../img/type_icon_questionary.svg"); background-image: url("/abweb/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("../img/type_icon_inspection.svg"); background-image: url("/abweb/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("../img/type_icon_proccess.svg"); background-image: url("/abweb/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/js/constant.js
...@@ -19,7 +19,7 @@ CONSTANT.SORT_TYPE = { ...@@ -19,7 +19,7 @@ CONSTANT.SORT_TYPE = {
CONSTANT.PAGE_NAME = { CONSTANT.PAGE_NAME = {
DASHBOARD: 'dashboard', DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList', OPERATION_LIST: 'operationList',
FOOTER: 'main-footer.html', FOOTER: 'mainFooter.html',
DEFAULT: 'index.html', DEFAULT: 'index.html',
LOGIN: './login.html', LOGIN: './login.html',
}; };
......
abweb/common/js/header.js
...@@ -12,16 +12,18 @@ ...@@ -12,16 +12,18 @@
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1) if(settings.dashboardHome == 1)
{ {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
HEADER.goDashboard(); HEADER.goDashboard();
} }
else else
{ {
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.goOperationList(); HEADER.goOperationList();
} }
}); });
} }
/** /**
* Go page of operationList * Go page of operationList
*/ */
...@@ -33,6 +35,7 @@ ...@@ -33,6 +35,7 @@
* Go page of dashboard * Go page of dashboard
*/ */
HEADER.goDashboard = function () { HEADER.goDashboard = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
COMMON.avwScreenMove("dashboard.html"); COMMON.avwScreenMove("dashboard.html");
}; };
......
abweb/common/json/lang/lang-en.json
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
"sortByEndDate":"End Date", "sortByEndDate":"End Date",
"sortByLastEdit":"Last Edit", "sortByLastEdit":"Last Edit",
"categorySelection":"Category Selection", "categorySelection":"Category Selection",
"categoryAll":"All" "categoryAll":"All",
"reportForm": "Report",
"periodicInspectionPeriod": "Periodic Inspection Period"
} }
\ No newline at end of file
abweb/common/json/lang/lang-ja.json
...@@ -110,5 +110,7 @@ ...@@ -110,5 +110,7 @@
"sortByEndDate":"古い順", "sortByEndDate":"古い順",
"sortByLastEdit":"閲覧日順", "sortByLastEdit":"閲覧日順",
"categorySelection":"カテゴリー選択", "categorySelection":"カテゴリー選択",
"categoryAll":"すべて" "categoryAll":"すべて",
"reportForm": "報告",
"periodicInspectionPeriod": "定期点検期間"
} }
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
...@@ -109,5 +109,7 @@ ...@@ -109,5 +109,7 @@
"sortByEndDate":"End Date", "sortByEndDate":"End Date",
"sortByLastEdit":"Last Edit", "sortByLastEdit":"Last Edit",
"categorySelection":"Category Selection", "categorySelection":"Category Selection",
"categoryAll":"All" "categoryAll":"All",
"reportForm": "보고서",
"periodicInspectionPeriod": "정기점검기간"
} }
\ No newline at end of file
abweb/html/common/header.html
...@@ -6,13 +6,13 @@ ...@@ -6,13 +6,13 @@
<img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo"> <img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
</a> </a>
<ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex"> <ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex">
<li class="active nav-link"> <li class="active nav-link" id="iconHomeDashboard">
<a href="dashboard.html" class="d-block text-center text-decoration-none"> <a href="dashboard.html" class="d-block text-center text-decoration-none">
<img src="../common/img/nav_icon_dashboard.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="dashboard"> <img src="../common/img/nav_icon_dashboard.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="dashboard">
<div class="fs-7 d-sm-block d-none lang" lang="dashboard"></div> <div class="fs-7 d-sm-block d-none lang" lang="dashboard"></div>
</a> </a>
</li> </li>
<li class="nav-link"> <li class="nav-link" id="iconHomeWorkList">
<a href="index.html" class="d-block text-center text-decoration-none"> <a href="index.html" class="d-block text-center text-decoration-none">
<img src="../common/img/nav_icon_task.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="workList"> <img src="../common/img/nav_icon_task.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="workList">
<div class="fs-7 d-sm-block d-none lang" lang="workList"></div> <div class="fs-7 d-sm-block d-none lang" lang="workList"></div>
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile"> <div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<h6 class="dropdown-header" id="dspLoginId" ></h6> <h6 class="dropdown-header" id="dspLoginId" ></h6>
<a class="dropdown-item " href="account-setting.html" > <a class="dropdown-item " href="accountSetting.html" >
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting"> <img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
<span class="lang" style=" color: #6c757d;" lang="account_setting"></span> <span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
</a> </a>
<a class="dropdown-item " href="#" data-toggle="modal" data-target="#confirm-modal" id="btnLogout"> <a class="dropdown-item " href="login.html" id="btnLogout">
<img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout"> <img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
<span class="lang" style=" color: #6c757d;" lang="dspLogout"></span> <span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
</a> </a>
......
abweb/html/dashboard.html
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js"></script> <script type="text/javascript" src="../js/header/header.js"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
...@@ -36,13 +36,13 @@ ...@@ -36,13 +36,13 @@
</head> </head>
<body> <body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- dashboard --> <!-- dashboard -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- header -->
<div id="includedHeader"></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>
......
abweb/html/index.html
...@@ -24,12 +24,13 @@ ...@@ -24,12 +24,13 @@
<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="../js/operationList/operationList.js?__UPDATEID__"></script>
<script src="../js/dashboardSetting/dashboard-setting.js?__UPDATEID__"></script> <script src="../js/dashboardSetting/dashboardSetting.js?__UPDATEID__"></script>
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script> <script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/template/template.js?__UPDATEID__"></script> <script src="../js/template/template.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script> <script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script> <script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__" defer></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
......
abweb/html/pickup.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<!-- main js --> <!-- main js -->
<script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script src="/abweb/common/js/header.js?__UPDATEID__"></script> <script src="/abweb/common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
...@@ -44,13 +44,13 @@ ...@@ -44,13 +44,13 @@
</head> </head>
<body > <body >
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- pickup --> <!-- pickup -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- tab --> <!-- tab -->
<ul class="nav nav-tabs line" id="myTab" role="tablist"> <ul class="nav nav-tabs line" id="myTab" role="tablist">
<li class="nav-item" id="liTabNewReport"> <li class="nav-item" id="liTabNewReport">
......
abweb/html/push-message-detail.html → abweb/html/pushMessageDetail.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageDetail/push-message-detail.js"></script> <script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
......
abweb/html/push-message-list.html → abweb/html/pushMessageList.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageList/push-message-list.js"></script> <script type="text/javascript" src="../js/pushMessageList/pushMessageList.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
...@@ -37,12 +37,13 @@ ...@@ -37,12 +37,13 @@
<body> <body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- message list --> <!-- message list -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- header -->
<div id="includedHeader"></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">
......
abweb/html/reportForm.html 0 → 100644
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title class="lang" lang="reportForm"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/style.css">
<!-- vender css -->
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/fontawesome_relative_path.css">
<script type="text/javascript" src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/constant.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
</head>
<body onload="RF.init();">
<!-- header -->
<div id="includedHeader"></div>
<!-- report list -->
<main>
<div class="container-wrap">
<!-- breadcrumb -->
<nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0">
<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>
<li class="breadcrumb-item active" aria-current="page"><span>報告一覧</span></li>
<li class="breadcrumb-item active" aria-current="page"><span>報告</span></li>
</ol>
</nav>
<!-- title -->
<div class="d-flex align-items-center">
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto" lang="reportForm"></h1>
<div style="display: none;">
<div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>
<div><span id="inspectDate"></span></div>
</div>
<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">
</div>
</div>
</div>
</main>
<div class="mb-5" id="report-form"></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="../common/js/newdash/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/newdash/common.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/send-message.html → abweb/html/sendMessage.html
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
<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 type="text/javascript" src="../js/operationSelect/operation-select.js"></script> <script type="text/javascript" src="../js/operationSelect/operationSelect.js"></script>
<script type="text/javascript" src="../js/notification-content/notification-content.js"></script> <script type="text/javascript" src="../js/notificationContent/notificationContent.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/sendMessage/send-message.js"></script> <script type="text/javascript" src="../js/sendMessage/sendMessage.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
...@@ -39,12 +39,13 @@ ...@@ -39,12 +39,13 @@
<body> <body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- send message --> <!-- send message -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- content --> <!-- content -->
<div class="py-2"> <div class="py-2">
<div class="row"> <div class="row">
......
abweb/js/dashboard/dashboard.js
...@@ -121,6 +121,10 @@ DASHBOARD.initHtmlItem = function (item) { ...@@ -121,6 +121,10 @@ DASHBOARD.initHtmlItem = function (item) {
/** Initialization dashboard screen */ /** Initialization dashboard screen */
DASHBOARD.init = function () { DASHBOARD.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
DASHBOARD.loadCommon(); DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) { DASHBOARD.getDashboardData(function (dataDashboard) {
...@@ -173,14 +177,14 @@ DASHBOARD.goPickup = function (pickupId) { ...@@ -173,14 +177,14 @@ DASHBOARD.goPickup = function (pickupId) {
/** Direct to Message list screen */ /** Direct to Message list screen */
DASHBOARD.goMessageList = function () { DASHBOARD.goMessageList = function () {
COMMON.goUrlWithCurrentParams('push-message-list.html', {}); COMMON.goUrlWithCurrentParams('pushMessageList.html', {});
}; };
/** /**
* Direct to send message screen * Direct to send message screen
*/ */
DASHBOARD.goSendMessage = function () { DASHBOARD.goSendMessage = function () {
COMMON.goUrlWithCurrentParams('send-message.html', {}); COMMON.goUrlWithCurrentParams('sendMessage.html', {});
}; };
/** /**
......
abweb/js/dashboardSetting/dashboard-setting.js → abweb/js/dashboardSetting/dashboardSetting.js
/** /**
* Dashboard Setting js in dashboard.html * Dashboard Setting js in dashboard.html
* *
* @since 1.0 check web * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var DashboardSetting = {}; var DashboardSetting = {};
DashboardSetting.changeSettingCallback = function() {}; DashboardSetting.changeSettingCallback = function () {};
/** /**
* Html element array, map with json key from setting data API * Html element array, map with json key from setting data API
...@@ -27,33 +27,33 @@ DashboardSetting.defaultSetting = { ...@@ -27,33 +27,33 @@ DashboardSetting.defaultSetting = {
continousWork: 1, continousWork: 1,
warningReport: 1, warningReport: 1,
dashboardHome: 0, dashboardHome: 0,
} };
/** dummy setting json reponse */ /** dummy setting json reponse */
DashboardSetting.dummySettingJson = { DashboardSetting.dummySettingJson = {
dashboardSettingList: [ dashboardSettingList: [
{ {
"id": 1, id: 1,
"settingName": "New Report", settingName: 'New Report',
"settingValue": 1 settingValue: 1,
}, },
{ {
"id": 2, id: 2,
"settingName": "Continous Work", settingName: 'Continous Work',
"settingValue": 1 settingValue: 1,
}, },
{ {
"id": 3, id: 3,
"settingName": "Warning Report", settingName: 'Warning Report',
"settingValue": 1 settingValue: 1,
}, },
{ {
"id": 4, id: 4,
"settingName": "Dashboard Home", settingName: 'Dashboard Home',
"settingValue": 0 settingValue: 0,
} },
], ],
} };
/** /**
* get setting data from cms * get setting data from cms
...@@ -64,14 +64,18 @@ DashboardSetting.getSettingData = function (callback) { ...@@ -64,14 +64,18 @@ DashboardSetting.getSettingData = function (callback) {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
const url = DashboardSetting.baseApiUrl; const url = DashboardSetting.baseApiUrl;
COMMON.cmsAjax(url, param, false, function (json) { COMMON.cmsAjax(
url,
param,
false,
function (json) {
let settings = {}; let settings = {};
//map id with key when save setting //map id with key when save setting
const mapKeys = { const mapKeys = {
1: 'newReport', 1: 'newReport',
2: 'continousWork', 2: 'continousWork',
3: 'warningReport', 3: 'warningReport',
4: 'dashboardHome' 4: 'dashboardHome',
}; };
if (json && json.dashboardSettingList) { if (json && json.dashboardSettingList) {
for (const item of json.dashboardSettingList) { for (const item of json.dashboardSettingList) {
...@@ -84,9 +88,11 @@ DashboardSetting.getSettingData = function (callback) { ...@@ -84,9 +88,11 @@ DashboardSetting.getSettingData = function (callback) {
if (callback) { if (callback) {
callback(settings); callback(settings);
} }
}, function() { },
function () {
console.log('DashboardSetting.getSettingData error'); console.log('DashboardSetting.getSettingData error');
}); },
);
}; };
/** /**
...@@ -123,15 +129,21 @@ DashboardSetting.saveSetting = function () { ...@@ -123,15 +129,21 @@ DashboardSetting.saveSetting = function () {
param[key] = element.enabled ? 1 : 0; param[key] = element.enabled ? 1 : 0;
} }
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.SAVE_DASHBOARD_SETTING; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.SAVE_DASHBOARD_SETTING;
COMMON.cmsAjax(url, param, false, function (json) { COMMON.cmsAjax(
url,
param,
false,
function (json) {
DashboardSetting.closeModal(); DashboardSetting.closeModal();
if (DashboardSetting.changeSettingCallback && typeof DashboardSetting.changeSettingCallback === 'function') { if (DashboardSetting.changeSettingCallback && typeof DashboardSetting.changeSettingCallback === 'function') {
DashboardSetting.changeSettingCallback(); DashboardSetting.changeSettingCallback();
} }
}, function() { },
function () {
console.log('DashboardSetting.saveSetting error'); console.log('DashboardSetting.saveSetting error');
DashboardSetting.closeModal(); DashboardSetting.closeModal();
}); },
);
}; };
/** /**
......
abweb/js/login/login.js
// prepared to use Global object(LOGIN) /**
* prepared to use Global object(LOGIN)
* @since cms:1.4.3.2&1.4.3.3 web:1.0
**/
var LOGIN = {}; var LOGIN = {};
// var requirePasswordChange; // var requirePasswordChange;
...@@ -9,12 +13,12 @@ LOGIN.optionList = []; ...@@ -9,12 +13,12 @@ LOGIN.optionList = [];
LOGIN.force_pw_change_on_login; LOGIN.force_pw_change_on_login;
LOGIN.force_pw_change_periodically; LOGIN.force_pw_change_periodically;
LOGIN.login_error_flag = false; LOGIN.login_error_flag = false;
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
LOGIN.timeWaitSplashScreen = 2000;// wait splash screen 2 second LOGIN.timeWaitSplashScreen = 2000; // wait splash screen 2 second
// Load login Info // Load login Info
LOGIN.loadLoginInfo = function() { LOGIN.loadLoginInfo = function () {
$('#chkRemember').attr('checked', 'checked'); $('#chkRemember').attr('checked', 'checked');
if (ClientData.userInfo_accountPath() != null) { if (ClientData.userInfo_accountPath() != null) {
$('#txtAccPath').val(ClientData.userInfo_accountPath()); $('#txtAccPath').val(ClientData.userInfo_accountPath());
...@@ -26,19 +30,17 @@ LOGIN.loadLoginInfo = function() { ...@@ -26,19 +30,17 @@ LOGIN.loadLoginInfo = function() {
}; };
// Initial Screen // Initial Screen
LOGIN.initialScreen = function() { LOGIN.initialScreen = function () {
if (ClientData.userInfo_rememberLogin()) { if (ClientData.userInfo_rememberLogin()) {
LOGIN.loadLoginInfo(); LOGIN.loadLoginInfo();
} else { } else {
$('#txtAccPath').val(""); $('#txtAccPath').val('');
$('#txtAccId').val(""); $('#txtAccId').val('');
} }
}; };
// check Save Login Info // check Save Login Info
LOGIN.saveLoginInfo = function() { LOGIN.saveLoginInfo = function () {
var lang = I18N.getCurrentLanguage(); var lang = I18N.getCurrentLanguage();
// load language // load language
I18N.changeLanguage(lang); I18N.changeLanguage(lang);
...@@ -71,30 +73,28 @@ LOGIN.saveLoginInfo = function() { ...@@ -71,30 +73,28 @@ LOGIN.saveLoginInfo = function() {
// reset to paging function // reset to paging function
ClientData.JumpQueue([]); ClientData.JumpQueue([]);
ClientData.IsJumpBack(false); ClientData.IsJumpBack(false);
}; };
// Check validation // Check validation
LOGIN.checkValidation = function() { LOGIN.checkValidation = function () {
var accountPath = $('#txtAccPath').val(); var accountPath = $('#txtAccPath').val();
var loginId = $('#txtAccId').val(); var loginId = $('#txtAccId').val();
var password = $('#txtPassword').val(); var password = $('#txtPassword').val();
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
if (!ValidationUtil.CheckRequiredForText(accountPath)) { if (!ValidationUtil.CheckRequiredForText(accountPath)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgLoginEmpty')); msgError.html(I18N.i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty'); msgError.attr('lang', 'msgLoginEmpty');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckRequiredForText(loginId)) { } else if (!ValidationUtil.CheckRequiredForText(loginId)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgLoginEmpty')); msgError.html(I18N.i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty'); msgError.attr('lang', 'msgLoginEmpty');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckRequiredForText(password)) { } else if (!ValidationUtil.CheckRequiredForText(password)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgLoginEmpty')); msgError.html(I18N.i18nText('msgLoginEmpty'));
msgError.attr('lang', 'msgLoginEmpty'); msgError.attr('lang', 'msgLoginEmpty');
msgError.show(); msgError.show();
...@@ -105,51 +105,51 @@ LOGIN.checkValidation = function() { ...@@ -105,51 +105,51 @@ LOGIN.checkValidation = function() {
}; };
// Check Dialog validation // Check Dialog validation
LOGIN.checkDialogValidation = function() { LOGIN.checkDialogValidation = function () {
var currentPass = $('#txtCurrentPass').val(); var currentPass = $('#txtCurrentPass').val();
var newPass = $('#txtNewPass').val(); var newPass = $('#txtNewPass').val();
var confirmPass = $('#txtConfirmNew').val(); var confirmPass = $('#txtConfirmNew').val();
var msgError = $('#dialog-error-message'); var msgError = $('#dialog-error-message');
if (!ValidationUtil.CheckRequiredForText(currentPass)) { if (!ValidationUtil.CheckRequiredForText(currentPass)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgPwdEmpty')); msgError.html(I18N.i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty'); msgError.attr('lang', 'msgPwdEmpty');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckRequiredForText(newPass)) { } else if (!ValidationUtil.CheckRequiredForText(newPass)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgPwdEmpty')); msgError.html(I18N.i18nText('msgPwdEmpty'));
msgError.attr('lang', 'msgPwdEmpty'); msgError.attr('lang', 'msgPwdEmpty');
msgError.show(); msgError.show();
return false; return false;
} else { } else {
if (newPass != confirmPass) { if (newPass != confirmPass) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgPwdNotMatch')); msgError.html(I18N.i18nText('msgPwdNotMatch'));
msgError.attr('lang', 'msgPwdNotMatch'); msgError.attr('lang', 'msgPwdNotMatch');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckMinLengthForByte(newPass, 6)) { } else if (!ValidationUtil.CheckMinLengthForByte(newPass, 6)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgInvaildLength')); msgError.html(I18N.i18nText('msgInvaildLength'));
msgError.attr('lang', 'msgInvaildLength'); msgError.attr('lang', 'msgInvaildLength');
msgError.show(); msgError.show();
return false; return false;
} else if (!ValidationUtil.CheckMaxLengthForByte(newPass, 16)) { } else if (!ValidationUtil.CheckMaxLengthForByte(newPass, 16)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgInvaildLength')); msgError.html(I18N.i18nText('msgInvaildLength'));
msgError.attr('lang', 'msgInvaildLength'); msgError.attr('lang', 'msgInvaildLength');
msgError.show(); msgError.show();
return false; return false;
} else if (ValidationUtil.HasSeqChar(newPass, 3)) { } else if (ValidationUtil.HasSeqChar(newPass, 3)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgHasSeqChar')); msgError.html(I18N.i18nText('msgHasSeqChar'));
msgError.attr('lang', 'msgHasSeqChar'); msgError.attr('lang', 'msgHasSeqChar');
msgError.show(); msgError.show();
return false; return false;
} else if (ValidationUtil.ContainSameSeqChar(newPass, currentPass, 4)) { } else if (ValidationUtil.ContainSameSeqChar(newPass, currentPass, 4)) {
LOGIN.login_errorMessage = ""; LOGIN.login_errorMessage = '';
msgError.html(I18N.i18nText('msgContainSameSeqChar')); msgError.html(I18N.i18nText('msgContainSameSeqChar'));
msgError.attr('lang', 'msgContainSameSeqChar'); msgError.attr('lang', 'msgContainSameSeqChar');
msgError.show(); msgError.show();
...@@ -161,10 +161,10 @@ LOGIN.checkDialogValidation = function() { ...@@ -161,10 +161,10 @@ LOGIN.checkDialogValidation = function() {
}; };
// Login Process // Login Process
LOGIN.processLogin = function() { LOGIN.processLogin = function () {
var accountPath = ""; var accountPath = '';
var loginId = ""; var loginId = '';
var password = ""; var password = '';
loginId = $('#txtAccId').val(); loginId = $('#txtAccId').val();
...@@ -175,10 +175,10 @@ LOGIN.processLogin = function() { ...@@ -175,10 +175,10 @@ LOGIN.processLogin = function() {
var skipPwdDate; var skipPwdDate;
var params = { var params = {
previousSid : '', previousSid: '',
loginId : loginId, loginId: loginId,
password : password, password: password,
urlpath : accountPath urlpath: accountPath,
}; };
// Set sid for login, this will be checked authoring 2 sessions // Set sid for login, this will be checked authoring 2 sessions
...@@ -188,7 +188,11 @@ LOGIN.processLogin = function() { ...@@ -188,7 +188,11 @@ LOGIN.processLogin = function() {
// Get url to login // Get url to login
url = COMMON.format(ClientData.conf_checkApiUrl(), accountPath) + CONSTANT.URL.CMS.API.LOGIN; url = COMMON.format(ClientData.conf_checkApiUrl(), accountPath) + CONSTANT.URL.CMS.API.LOGIN;
COMMON.cmsAjax(url, params, true, function(data) { COMMON.cmsAjax(
url,
params,
true,
function (data) {
LOGIN.userinfo_sid = data.sid; LOGIN.userinfo_sid = data.sid;
LOGIN.userInfo_userName = data.userName; LOGIN.userInfo_userName = data.userName;
LOGIN.optionList = data.serviceOptionList; LOGIN.optionList = data.serviceOptionList;
...@@ -203,24 +207,24 @@ LOGIN.processLogin = function() { ...@@ -203,24 +207,24 @@ LOGIN.processLogin = function() {
$('#main-error-message').css('display', 'none'); $('#main-error-message').css('display', 'none');
console.log("data.requirePasswordChange:" + data.requirePasswordChange); console.log('data.requirePasswordChange:' + data.requirePasswordChange);
COMMON.closeLoading(); COMMON.closeLoading();
if (data.requirePasswordChange == 0) { if (data.requirePasswordChange == 0) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page // move to home.html page
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} else if (data.requirePasswordChange == 1) { } else if (data.requirePasswordChange == 1) {
if (LOGIN.force_pw_change_on_login == 2) {
if (LOGIN.force_pw_change_on_login == 2) { // force to change // force to change
// password // password
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$(".ui-dialog-titlebar").hide(); $('.ui-dialog-titlebar').hide();
$('#btnSkip').hide(); $('#btnSkip').hide();
$("#txtPwdRemind").css('visibility', 'hidden'); $('#txtPwdRemind').css('visibility', 'hidden');
} else if (LOGIN.force_pw_change_on_login == 1) { // recommend } else if (LOGIN.force_pw_change_on_login == 1) {
// recommend
// to change // to change
// password // password
...@@ -230,31 +234,31 @@ LOGIN.processLogin = function() { ...@@ -230,31 +234,31 @@ LOGIN.processLogin = function() {
if (skipPwdDate == null || skipPwdDate == 'undefined') { if (skipPwdDate == null || skipPwdDate == 'undefined') {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show(); $('#btnSkip').show();
$(".ui-dialog-titlebar").hide(); $('.ui-dialog-titlebar').hide();
} else { } else {
var date = new Date(); var date = new Date();
var skpPwdDt = new Date(skipPwdDate); var skpPwdDt = new Date(skipPwdDate);
var numDay = date.subtractByDays(skpPwdDt); var numDay = date.subtractByDays(skpPwdDt);
if (numDay <= 30) { if (numDay <= 30) {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page // move to home.html page
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} else if (numDay > 30) { } else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$('#btnSkip').show(); $('#btnSkip').show();
$(".ui-dialog-titlebar").hide(); $('.ui-dialog-titlebar').hide();
} }
} }
} else { // no need to change password } else {
// no need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page // move to home.html page
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} }
} else if (data.requirePasswordChange == 2) { } else if (data.requirePasswordChange == 2) {
if (LOGIN.force_pw_change_periodically == 1) {
if (LOGIN.force_pw_change_periodically == 1) { // recommend to // recommend to
// change // change
// password // password
$('#btnSkip').show(); $('#btnSkip').show();
...@@ -262,9 +266,8 @@ LOGIN.processLogin = function() { ...@@ -262,9 +266,8 @@ LOGIN.processLogin = function() {
if (skipPwdDate == null || skipPwdDate == 'undefined') { if (skipPwdDate == null || skipPwdDate == 'undefined') {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$(".ui-dialog-titlebar").hide(); $('.ui-dialog-titlebar').hide();
} else { } else {
var date = new Date(); var date = new Date();
var skpPwdDt = new Date(skipPwdDate); var skpPwdDt = new Date(skipPwdDate);
var numDay = date.subtractByDays(skpPwdDt); var numDay = date.subtractByDays(skpPwdDt);
...@@ -273,25 +276,26 @@ LOGIN.processLogin = function() { ...@@ -273,25 +276,26 @@ LOGIN.processLogin = function() {
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page // move to home.html page
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} else if (numDay > 30) { } else if (numDay > 30) {
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$(".ui-dialog-titlebar").hide(); $('.ui-dialog-titlebar').hide();
} }
} }
} else if (LOGIN.force_pw_change_periodically == 2) { // Force } else if (LOGIN.force_pw_change_periodically == 2) {
// Force
// to // to
// change // change
// password // password
LOGIN.OpenChangePasswordDialog(); LOGIN.OpenChangePasswordDialog();
$('#btnSkip').hide(); $('#btnSkip').hide();
$(".ui-dialog-titlebar").hide(); $('.ui-dialog-titlebar').hide();
$("#txtPwdRemind").css('visibility', 'hidden'); $('#txtPwdRemind').css('visibility', 'hidden');
} else { // No need to change password } else {
// No need to change password
ClientData.userInfo_sid(ClientData.userInfo_sid_local()); ClientData.userInfo_sid(ClientData.userInfo_sid_local());
// move to home.html page // move to home.html page
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} }
} }
} else { } else {
...@@ -299,10 +303,9 @@ LOGIN.processLogin = function() { ...@@ -299,10 +303,9 @@ LOGIN.processLogin = function() {
LOGIN.login_errorMessage = data.errorMessage; LOGIN.login_errorMessage = data.errorMessage;
$('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString()); $('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), data.errorMessage).toString());
$('#main-error-message').show(); $('#main-error-message').show();
} }
},
}, function(result) { function (result) {
LOGIN.login_error_flag = true; LOGIN.login_error_flag = true;
COMMON.closeLoading(); COMMON.closeLoading();
if (result.errorMessage) { if (result.errorMessage) {
...@@ -312,22 +315,23 @@ LOGIN.processLogin = function() { ...@@ -312,22 +315,23 @@ LOGIN.processLogin = function() {
$('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), 'E001')); $('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
} }
$('#main-error-message').show(); $('#main-error-message').show();
}); },
);
}; };
// Change Password Process // Change Password Process
LOGIN.changePasswordProcess = function() { LOGIN.changePasswordProcess = function () {
var sid = ClientData.userInfo_sid_local(); var sid = ClientData.userInfo_sid_local();
var loginId = $('#txtAccId').val(); var loginId = $('#txtAccId').val();
var password = $('#txtCurrentPass').val(); var password = $('#txtCurrentPass').val();
var confirmPass = $('#txtConfirmNew').val(); var confirmPass = $('#txtConfirmNew').val();
var params = { var params = {
sid : sid, sid: sid,
loginId : loginId, loginId: loginId,
password : password, password: password,
newPassword : confirmPass, newPassword: confirmPass,
appId : 4 appId: 4,
}; };
if (I18N.getCurrentLanguage()) { if (I18N.getCurrentLanguage()) {
...@@ -336,7 +340,11 @@ LOGIN.changePasswordProcess = function() { ...@@ -336,7 +340,11 @@ LOGIN.changePasswordProcess = function() {
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
COMMON.cmsAjax(url, params, false, function(result) { COMMON.cmsAjax(
url,
params,
false,
function (result) {
if (result.httpStatus == '200') { if (result.httpStatus == '200') {
LOGIN.CloseChangePasswordDialog(); LOGIN.CloseChangePasswordDialog();
$('#dialog-error-message').css('display', 'none'); $('#dialog-error-message').css('display', 'none');
...@@ -344,11 +352,10 @@ LOGIN.changePasswordProcess = function() { ...@@ -344,11 +352,10 @@ LOGIN.changePasswordProcess = function() {
if (ClientData.serviceOpt_abook_check() == 'Y') { if (ClientData.serviceOpt_abook_check() == 'Y') {
// move to home.html page // move to home.html page
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} else { } else {
$('#dialog-error-message').html(I18N.i18nText('msgPwdChangeNG')); $('#dialog-error-message').html(I18N.i18nText('msgPwdChangeNG'));
$('#dialog-error-message').show(); $('#dialog-error-message').show();
} }
} else if (result.httpStatus == '401') { } else if (result.httpStatus == '401') {
COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN); COMMON.goUrlWithCurrentParams(CONSTANT.PAGE_NAME.LOGIN);
...@@ -356,7 +363,8 @@ LOGIN.changePasswordProcess = function() { ...@@ -356,7 +363,8 @@ LOGIN.changePasswordProcess = function() {
$('#dialog-error-message').html(data.message); $('#dialog-error-message').html(data.message);
$('#dialog-error-message').show(); $('#dialog-error-message').show();
} }
}, function(result) { },
function (result) {
COMMON.closeLoading(); COMMON.closeLoading();
if (result.errorMessage) { if (result.errorMessage) {
$('#dialog-error-message').html(result.errorMessage); $('#dialog-error-message').html(result.errorMessage);
...@@ -364,21 +372,21 @@ LOGIN.changePasswordProcess = function() { ...@@ -364,21 +372,21 @@ LOGIN.changePasswordProcess = function() {
$('#dialog-error-message').html(I18N.i18nText('msgPwdChangeNG')); $('#dialog-error-message').html(I18N.i18nText('msgPwdChangeNG'));
} }
$('#dialog-error-message').show(); $('#dialog-error-message').show();
},
}); );
}; };
// Change Language English // Change Language English
LOGIN.changeLanguage = function(lang) { LOGIN.changeLanguage = function (lang) {
I18N.changeLanguage(lang); I18N.changeLanguage(lang);
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
if (LOGIN.login_errorMessage != "") { if (LOGIN.login_errorMessage != '') {
$('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), LOGIN.login_errorMessage).toString()); $('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), LOGIN.login_errorMessage).toString());
} }
}; };
// 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();
...@@ -388,14 +396,14 @@ LOGIN.loginFunction = function() { ...@@ -388,14 +396,14 @@ LOGIN.loginFunction = function() {
}; };
// Change Password function // Change Password function
LOGIN.changePassFunction = function() { LOGIN.changePassFunction = function () {
if (LOGIN.checkDialogValidation()) { if (LOGIN.checkDialogValidation()) {
LOGIN.changePasswordProcess(); LOGIN.changePasswordProcess();
} }
}; };
// Skip Password function // Skip Password function
LOGIN.skipPassFunction = function() { LOGIN.skipPassFunction = function () {
var date = new Date(); var date = new Date();
ClientData.userInfo_pwdSkipDt(date); ClientData.userInfo_pwdSkipDt(date);
...@@ -403,32 +411,29 @@ LOGIN.skipPassFunction = function() { ...@@ -403,32 +411,29 @@ LOGIN.skipPassFunction = function() {
if (ClientData.serviceOpt_abook_check() == 'Y') { if (ClientData.serviceOpt_abook_check() == 'Y') {
// move to home.html page // move to home.html page
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} else { } else {
$('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), 'E001')); $('#main-error-message').html(COMMON.format(I18N.i18nText('msgLoginErrWrong'), 'E001'));
$('#main-error-message').show(); $('#main-error-message').show();
} }
}; };
// 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
LOGIN.saveServiceUserOption = function() { LOGIN.saveServiceUserOption = function () {
$.each(LOGIN.optionList, function (i, option) {
$.each(LOGIN.optionList, function(i, option) {
if (option.serviceOptionId == 22) { if (option.serviceOptionId == 22) {
ClientData.serviceOpt_force_pw_change_periodically(option.value); ClientData.serviceOpt_force_pw_change_periodically(option.value);
} else if (option.serviceOptionId == 21) { } else if (option.serviceOptionId == 21) {
...@@ -444,42 +449,39 @@ LOGIN.saveServiceUserOption = function() { ...@@ -444,42 +449,39 @@ LOGIN.saveServiceUserOption = function() {
}; };
// Get Service Option // Get Service Option
LOGIN.getServiceOptionList = function() { LOGIN.getServiceOptionList = function () {
$.each(LOGIN.optionList, function (i, option) {
$.each(LOGIN.optionList, function(i, option) {
if (option.serviceOptionId == 22) { if (option.serviceOptionId == 22) {
LOGIN.force_pw_change_periodically = option.value; LOGIN.force_pw_change_periodically = option.value;
} else if (option.serviceOptionId == 21) { } else if (option.serviceOptionId == 21) {
LOGIN.force_pw_change_on_login = option.value; LOGIN.force_pw_change_on_login = option.value;
} }
}); });
}; };
LOGIN.loginWhenClickEnter = function(e) { LOGIN.loginWhenClickEnter = function (e) {
var code = (e.keyCode ? e.keyCode : e.which); var code = e.keyCode ? e.keyCode : e.which;
if (code == 13) { // Enter keycode if (code == 13) {
// Enter keycode
$('#btnLogin').click(); $('#btnLogin').click();
} }
}; };
// init login for normal user // init login for normal user
LOGIN.initLoginNormalUser = function() { LOGIN.initLoginNormalUser = function () {
document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspLogin') + ' | ' + I18N.i18nText('sysAppTitle');
// Initial Screen // Initial Screen
LOGIN.initialScreen(); LOGIN.initialScreen();
// Change language // Change language
let selector = document.getElementById("languageSelect"); let selector = document.getElementById('languageSelect');
var lang = I18N.getCurrentLanguage(); var lang = I18N.getCurrentLanguage();
if (lang) { if (lang) {
selector.value = lang; selector.value = lang;
} }
selector.addEventListener("change", function() { selector.addEventListener('change', function () {
LOGIN.changeLanguage(this.value); LOGIN.changeLanguage(this.value);
}) });
// Button login click event // Button login click event
$('#btnLogin').click(LOGIN.loginFunction); $('#btnLogin').click(LOGIN.loginFunction);
...@@ -491,30 +493,27 @@ LOGIN.initLoginNormalUser = function() { ...@@ -491,30 +493,27 @@ LOGIN.initLoginNormalUser = function() {
$('#txtPassword').keydown(LOGIN.loginWhenClickEnter); $('#txtPassword').keydown(LOGIN.loginWhenClickEnter);
}; };
/* display alert screen */ /* display alert screen */
LOGIN.showAlertScreen = function(errMes, scrMove) { LOGIN.showAlertScreen = function (errMes, scrMove) {
// アラートメッセージの表示 // アラートメッセージの表示
if (errMes == undefined || errMes == "") { if (errMes == undefined || errMes == '') {
errMes = "message."; // I18N.i18nText('msgPageImgErr'); errMes = 'message.'; // I18N.i18nText('msgPageImgErr');
} }
COMMON.lockLayout(); COMMON.lockLayout();
/* show error messages */ /* show error messages */
$().toastmessage({ $().toastmessage({
position : 'middle-center' position: 'middle-center',
}); });
$().toastmessage('showToast', { $().toastmessage('showToast', {
type : 'error', type: 'error',
sticky : true, sticky: true,
text : errMes, text: errMes,
close : function() { close: function () {},
}
}); });
$('.toast-type-error').css('height', '100px'); $('.toast-type-error').css('height', '100px');
$('.toast-type-error > p').css('padding-top', '35px'); $('.toast-type-error > p').css('padding-top', '35px');
$('.toast-item-close').live('click', function() { $('.toast-item-close').live('click', function () {
COMMON.unlockLayout(); COMMON.unlockLayout();
if (scrMove) { if (scrMove) {
COMMON.avwScreenMove(scrMove); COMMON.avwScreenMove(scrMove);
...@@ -523,8 +522,7 @@ LOGIN.showAlertScreen = function(errMes, scrMove) { ...@@ -523,8 +522,7 @@ LOGIN.showAlertScreen = function(errMes, scrMove) {
}; };
// $(document).ready(function (e) { // $(document).ready(function (e) {
LOGIN.ready = function() { LOGIN.ready = function () {
// Session Storage clear // Session Storage clear
SessionStorageUtils.clear(); SessionStorageUtils.clear();
COMMON.userSessionObj = null; COMMON.userSessionObj = null;
...@@ -534,28 +532,24 @@ LOGIN.ready = function() { ...@@ -534,28 +532,24 @@ LOGIN.ready = function() {
var sysSettings = COMMON.sysSetting(); // get info in conf.json var sysSettings = COMMON.sysSetting(); // get info in conf.json
// check an getits setting // check an getits setting
if (sysSettings.apiUrl == "") { if (sysSettings.apiUrl == '') {
// acquire parameters // acquire parameters
var siteUrl = COMMON.getUrlParam('siteUrl', ''); var siteUrl = COMMON.getUrlParam('siteUrl', '');
var urlPath = COMMON.getUrlParam('urlPath', ''); var urlPath = COMMON.getUrlParam('urlPath', '');
var storeUrl = COMMON.getUrlParam('storeUrl', ''); var storeUrl = COMMON.getUrlParam('storeUrl', '');
if (siteUrl != "" && urlPath != "") { if (siteUrl != '' && urlPath != '') {
// ClientData.siteUrl(siteUrl); // ClientData.siteUrl(siteUrl);
// set api connection // set api connection
ClientData.conf_apiUrl(siteUrl + "{0}/abvapi"); ClientData.conf_apiUrl(siteUrl + '{0}/abvapi');
ClientData.conf_apiLoginUrl(siteUrl + "nuabvapi"); ClientData.conf_apiLoginUrl(siteUrl + 'nuabvapi');
ClientData.conf_checkApiUrl(siteUrl + "checkapi/web"); ClientData.conf_checkApiUrl(siteUrl + 'checkapi/web');
ClientData.conf_apiResourceDlUrl(siteUrl + "{0}/dl"); ClientData.conf_apiResourceDlUrl(siteUrl + '{0}/dl');
// set account setting value // set account setting value
ClientData.userInfo_accountPath(urlPath); ClientData.userInfo_accountPath(urlPath);
ClientData.userInfo_accountPath_session(urlPath); ClientData.userInfo_accountPath_session(urlPath);
ClientData.userInfo_loginId(""); ClientData.userInfo_loginId('');
ClientData.userInfo_loginId_session(""); ClientData.userInfo_loginId_session('');
} }
} else { } else {
// conf parameter set // conf parameter set
ClientData.conf_apiUrl(sysSettings.apiUrl); ClientData.conf_apiUrl(sysSettings.apiUrl);
...@@ -568,20 +562,32 @@ LOGIN.ready = function() { ...@@ -568,20 +562,32 @@ LOGIN.ready = function() {
$('#normalUser').show(); $('#normalUser').show();
$('#formlogin').hide(); $('#formlogin').hide();
$('#logologin').animate({ $('#logologin').animate(
"margin-top" : 0 {
}, LOGIN.timeWaitSplashScreen, function() { 'margin-top': 0,
},
LOGIN.timeWaitSplashScreen,
function () {
$('#formlogin').show(); $('#formlogin').show();
$('#menu-language').animate({ $('#menu-language').animate(
opacity : 1 {
}, LOGIN.timeWaitSplashScreen); opacity: 1,
$('#formlogin').animate({ },
opacity : 1 LOGIN.timeWaitSplashScreen,
}, LOGIN.timeWaitSplashScreen); );
$('.cnt_footer').animate({ $('#formlogin').animate(
opacity : 1 {
}, LOGIN.timeWaitSplashScreen); opacity: 1,
}); },
LOGIN.timeWaitSplashScreen,
);
$('.cnt_footer').animate(
{
opacity: 1,
},
LOGIN.timeWaitSplashScreen,
);
},
);
LOGIN.initLoginNormalUser(); LOGIN.initLoginNormalUser();
}; };
abweb/js/notification-content/notification-content.js → abweb/js/notificationContent/notificationContent.js
/** /**
* Operation Select js in operation-select.html * Operation Select js in operationSelect.html
* *
* @since 1.0 check web * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var NotificationSelect = {}; var NotificationSelect = {};
NotificationSelect.nameSelected=""; NotificationSelect.nameSelected = '';
NotificationSelect.valueSelected=""; NotificationSelect.valueSelected = '';
/** /**
* default operation select data JSON * default operation select data JSON
*/ */
...@@ -21,16 +21,22 @@ NotificationSelect.getNotificationSelectData = function (callback) { ...@@ -21,16 +21,22 @@ NotificationSelect.getNotificationSelectData = function (callback) {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_TEMPLATE; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_TEMPLATE;
COMMON.cmsAjax(url, param, false, function (json) { COMMON.cmsAjax(
url,
param,
false,
function (json) {
if (callback) { if (callback) {
callback(json); callback(json);
} }
}, function() { },
function () {
console.log('NotificationSelect.getNotificationSelectData error'); console.log('NotificationSelect.getNotificationSelectData error');
if (callback) { if (callback) {
callback(NotificationSelect.defaultNotificationSelectJson); callback(NotificationSelect.defaultNotificationSelectJson);
} }
}); },
);
}; };
/** /**
...@@ -48,7 +54,7 @@ NotificationSelect.selectOperationClick = function () { ...@@ -48,7 +54,7 @@ NotificationSelect.selectOperationClick = function () {
/** /**
* init data, action when screen onload * init data, action when screen onload
*/ */
NotificationSelect.init = function (selectedCallback) { NotificationSelect.init = function (selectedCallback) {
NotificationSelect.getNotificationSelectData(function (data) { NotificationSelect.getNotificationSelectData(function (data) {
if (typeof data === 'undefined' || data == null) return; if (typeof data === 'undefined' || data == null) return;
NotificationSelect.createNotificationSelectList(data.pushMessageTemplate); NotificationSelect.createNotificationSelectList(data.pushMessageTemplate);
...@@ -61,24 +67,29 @@ NotificationSelect.selectOperationClick = function () { ...@@ -61,24 +67,29 @@ NotificationSelect.selectOperationClick = function () {
* Implement notification select html * Implement notification select html
* @returns * @returns
*/ */
NotificationSelect.createNotificationSelectList = function(pushMessageTemplate) { NotificationSelect.createNotificationSelectList = function (pushMessageTemplate) {
$("#notificationSelectList").empty(); $('#notificationSelectList').empty();
if (typeof pushMessageTemplate === 'undefined' || pushMessageTemplate.length < 1) return; if (typeof pushMessageTemplate === 'undefined' || pushMessageTemplate.length < 1) return;
let classSelected = "selected"; let classSelected = 'selected';
for (let i = 0; i < pushMessageTemplate.length; i++) { for (let i = 0; i < pushMessageTemplate.length; i++) {
let divName = $("<div class='pl-5 py-3 h-100 w-100 align-self-center select-label'>" + pushMessageTemplate[i].name + '</div>');
let divName = $("<div class='pl-5 py-3 h-100 w-100 align-self-center select-label'>" + pushMessageTemplate[i].name + "</div>"); let divIcon = $(
let divIcon = $("<div class='flex-shrink-1 mx-3 align-self-center'>" "<div class='flex-shrink-1 mx-3 align-self-center'>" +
+ "<button class='btn btn-link border collapsed' type='button' data-toggle='collapse' data-target='#collapse" + i + "' aria-expanded='true' aria-controls='collapse" + i + "'>" "<button class='btn btn-link border collapsed' type='button' data-toggle='collapse' data-target='#collapse" +
+ "<div class='arrow-icon'></div>" i +
+ "</button></div>"); "' aria-expanded='true' aria-controls='collapse" +
i +
"'>" +
"<div class='arrow-icon'></div>" +
'</button></div>',
);
let ahrefName = $("<a href='#' class='d-flex text-decoration-none'></a>"); let ahrefName = $("<a href='#' class='d-flex text-decoration-none'></a>");
let divParentName = $("<div class='card mb-2 " + classSelected + "' id='heading" + i + "'></div>"); let divParentName = $("<div class='card mb-2 " + classSelected + "' id='heading" + i + "'></div>");
classSelected = ""; classSelected = '';
let divValue = $("<div id='collapse" + i + "' class='collapse' aria-labelledby='heading" + i + "' data-parent='#accordion" + i + "'></div>"); let divValue = $("<div id='collapse" + i + "' class='collapse' aria-labelledby='heading" + i + "' data-parent='#accordion" + i + "'></div>");
let divBodyValue = $("<div class='card-body'>" + pushMessageTemplate[i].value + "</div>"); let divBodyValue = $("<div class='card-body'>" + pushMessageTemplate[i].value + '</div>');
let messageli = $("<li class='accordion' id='accordion" + i + "'></li>"); let messageli = $("<li class='accordion' id='accordion" + i + "'></li>");
...@@ -88,28 +99,25 @@ NotificationSelect.selectOperationClick = function () { ...@@ -88,28 +99,25 @@ NotificationSelect.selectOperationClick = function () {
divValue.append(divBodyValue); divValue.append(divBodyValue);
messageli.append(divParentName); messageli.append(divParentName);
messageli.append(divValue); messageli.append(divValue);
if(i == 0) if (i == 0) {
{
NotificationSelect.nameSelected = pushMessageTemplate[i].name; NotificationSelect.nameSelected = pushMessageTemplate[i].name;
NotificationSelect.valueSelected = pushMessageTemplate[i].value; NotificationSelect.valueSelected = pushMessageTemplate[i].value;
} }
$("#notificationSelectList").append(messageli); $('#notificationSelectList').append(messageli);
} }
} };
/** /**
* handle click event of select button * handle click event of select button
*/ */
NotificationSelect.onClickTempalte = function () { NotificationSelect.onClickTempalte = function () {
NotificationSelect.chooseTemplate(); NotificationSelect.chooseTemplate();
}; };
/** /**
* Get operation select and call back function in main page * Get operation select and call back function in main page
*/ */
NotificationSelect.chooseTemplate = function () { NotificationSelect.chooseTemplate = function () {
let param = {}; let param = {};
param.nameSelected = NotificationSelect.nameSelected; param.nameSelected = NotificationSelect.nameSelected;
param.valueSelected = NotificationSelect.valueSelected; param.valueSelected = NotificationSelect.valueSelected;
...@@ -122,6 +130,6 @@ NotificationSelect.selectOperationClick = function () { ...@@ -122,6 +130,6 @@ NotificationSelect.selectOperationClick = function () {
/** /**
* close setting dialog * close setting dialog
*/ */
NotificationSelect.closeModal = function () { NotificationSelect.closeModal = function () {
$('#select-template-modal .close').click(); $('#select-template-modal .close').click();
}; };
abweb/js/operationList/operationList.js
...@@ -521,12 +521,13 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe ...@@ -521,12 +521,13 @@ OL.sendOperation = function (operationId, operationType, reportType, enableAddRe
//save operation logs. needed for sorting //save operation logs. needed for sorting
OL.saveOperationReadingLog(operationId, operationType, reportType); OL.saveOperationReadingLog(operationId, operationType, reportType);
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
let params = {}; if (enableAddReport == '1' || reportType == CONSTANT.REPORT_TYPE.ROUTINE) {
params.sid = COMMON.getSid(); sessionStorage.OL_operationId = operationId;
params.operationId = operationId; COMMON.avwScreenMove('reportList.html');
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST; } else {
const url = OL.createUrlOfOperation(enableAddReport, reportType); const url = 'reportForm.html?operationId=' + operationId;
COMMON.postCommunication(url, params); COMMON.avwScreenMove(url);
}
}; };
/** /**
......
abweb/js/operationSelect/operation-select.js → abweb/js/operationSelect/operationSelect.js
/** /**
* Operation Select js in operation-select.html * Operation Select js in operationSelect.html
* *
* @since 1.0 check web * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var OperationSelect = {}; var OperationSelect = {};
OperationSelect.changeSelectCallback = function() {}; OperationSelect.changeSelectCallback = function () {};
OperationSelect.operationIdSelected=""; OperationSelect.operationIdSelected = '';
OperationSelect.operationNameSelected=""; OperationSelect.operationNameSelected = '';
/** /**
* default operation select data JSON * default operation select data JSON
...@@ -23,16 +23,22 @@ OperationSelect.getOperationSelectData = function (callback) { ...@@ -23,16 +23,22 @@ OperationSelect.getOperationSelectData = function (callback) {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.OPERATION_SELECT; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.OPERATION_SELECT;
COMMON.cmsAjax(url, param, false, function (json) { COMMON.cmsAjax(
url,
param,
false,
function (json) {
if (callback) { if (callback) {
callback(json); callback(json);
} }
}, function() { },
function () {
console.log('OperationSelect.getOperationSelectData error'); console.log('OperationSelect.getOperationSelectData error');
if (callback) { if (callback) {
callback(OperationSelect.defaultOperationSelectJson); callback(OperationSelect.defaultOperationSelectJson);
} }
}); },
);
}; };
/** /**
...@@ -63,48 +69,47 @@ OperationSelect.init = function (selectedCallback) { ...@@ -63,48 +69,47 @@ OperationSelect.init = function (selectedCallback) {
* Implement operation select html * Implement operation select html
* @returns * @returns
*/ */
OperationSelect.createOperationSelectList = function(operationList) { OperationSelect.createOperationSelectList = function (operationList) {
$("#operationSelectList").empty(); $('#operationSelectList').empty();
if (typeof operationList === 'undefined' || operationList.length < 1) return; if (typeof operationList === 'undefined' || operationList.length < 1) return;
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>"); let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
let ahrefRequiredFlg = $("<a href='#' class='d-block px-5 py-3 text-decoration-none select-label' data-key='" + operationList[i].operationId + "' data-name='" + operationList[i].operationName + "' ></a>"); let ahrefRequiredFlg = $(
let divText = $("<div class='fs-12 text-truncate d-block'>"+ operationList[i].operationName + "</div>"); "<a href='#' class='d-block px-5 py-3 text-decoration-none select-label' data-key='" + operationList[i].operationId + "' data-name='" + operationList[i].operationName + "' ></a>",
);
let divText = $("<div class='fs-12 text-truncate d-block'>" + operationList[i].operationName + '</div>');
ahrefRequiredFlg.append(divText); ahrefRequiredFlg.append(divText);
messageli.append(ahrefRequiredFlg); messageli.append(ahrefRequiredFlg);
$("#operationSelectList").append(messageli); $('#operationSelectList').append(messageli);
} }
$("#operationSelectList :first-child").addClass("selected"); $('#operationSelectList :first-child').addClass('selected');
} };
/** /**
* handle click event of select button * handle click event of select button
*/ */
OperationSelect.onClickSelect = function () { OperationSelect.onClickSelect = function () {
OperationSelect.chooseOperationSelect(); OperationSelect.chooseOperationSelect();
}; };
/** /**
* Get operation select and call back function in main page * Get operation select and call back function in main page
*/ */
OperationSelect.chooseOperationSelect = function () { OperationSelect.chooseOperationSelect = function () {
let param = {}; let param = {};
param.operationIdSelected = OperationSelect.operationIdSelected; param.operationIdSelected = OperationSelect.operationIdSelected;
param.operationNameSelected = OperationSelect.operationNameSelected; param.operationNameSelected = OperationSelect.operationNameSelected;
OperationSelect.closeModal(); OperationSelect.closeModal();
if (OperationSelect.changeSelectCallback && typeof OperationSelect.changeSelectCallback === 'function') { if (OperationSelect.changeSelectCallback && typeof OperationSelect.changeSelectCallback === 'function') {
OperationSelect.changeSelectCallback(param.operationIdSelected,param.operationNameSelected ); OperationSelect.changeSelectCallback(param.operationIdSelected, param.operationNameSelected);
} }
}; };
/** /**
* close setting dialog * close setting dialog
*/ */
OperationSelect.closeModal = function () { OperationSelect.closeModal = function () {
$('#task-list-modal .close').click(); $('#task-list-modal .close').click();
}; };
abweb/js/pdfPrint/pdfPrint.js
// PDF PRINT function js /**
* PDF PRINT function js
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
**/
var PP = {}; var PP = {};
PP.init = function() { PP.init = function () {
console.log("PP.init"); //Check if user is logged in
COMMON.checkAuth(false);
console.log('PP.init');
PP.loadCommon(); PP.loadCommon();
PP.initPdfList(); PP.initPdfList();
}; };
PP.loadCommon = function() { PP.loadCommon = function () {
$("#includedHeader").load("../html/common/header.html" , function() { $('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n(); I18N.initi18n();
HEADER.init(); HEADER.init();
}); });
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() { $('#includedConfirmModal').load('../html/common/confirmModal.html', function () {
I18N.initi18n(); I18N.initi18n();
}); });
} };
PP.initPdfList = function() { PP.initPdfList = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId; params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST; params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.QUICK_REPORT_PRINT; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.QUICK_REPORT_PRINT;
$("#pdfPrint").load(url, params); $('#pdfPrint').load(url, params);
} else { } else {
COMMON.displayAlert("error"); COMMON.displayAlert('error');
COMMON.avwScreenMove("reportList.html"); COMMON.avwScreenMove('reportList.html');
} }
} };
\ No newline at end of file
abweb/js/pickup/pickup.js
...@@ -7,12 +7,12 @@ var PICKUP = {}; ...@@ -7,12 +7,12 @@ var PICKUP = {};
PICKUP.newReportList; PICKUP.newReportList;
PICKUP.continousWorkReport; PICKUP.continousWorkReport;
PICKUP.reportWithWarning; PICKUP.reportWithWarning;
PICKUP.pickupDefault = "newReport"; PICKUP.pickupDefault = 'newReport';
PICKUP.pickupActive = "newReport"; PICKUP.pickupActive = 'newReport';
PICKUP.countNewReportList = 0; PICKUP.countNewReportList = 0;
PICKUP.countContinousWorkReport = 0; PICKUP.countContinousWorkReport = 0;
PICKUP.countReportWithWarning= 0; PICKUP.countReportWithWarning = 0;
/** /**
* Report type * Report type
...@@ -21,31 +21,31 @@ PICKUP.REPORT_TYPE = { ...@@ -21,31 +21,31 @@ PICKUP.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
} };
/** /**
* operation type * operation type
*/ */
PICKUP.OPERATION_TYPE = { PICKUP.OPERATION_TYPE = {
LIST: "0", LIST: '0',
DRAWING: "1", DRAWING: '1',
VTOUR: "2", VTOUR: '2',
PDF: "3" PDF: '3',
}; };
/** /**
* task type of report answer * task type of report answer
*/ */
PICKUP.REPLYREPORT_TASK_TYPE = { PICKUP.REPLYREPORT_TASK_TYPE = {
REPORT: 0, REPORT: 0,
ANSWER: 1 ANSWER: 1,
} };
/** /**
* default Pickup List * default Pickup List
*/ */
PICKUP.defaultPickupList = { PICKUP.defaultPickupList = {
operationList:[] operationList: [],
} };
PICKUP.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()); PICKUP.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath());
PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.NEW_REPORT; PICKUP.getNewReportListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.API.NEW_REPORT;
...@@ -55,20 +55,26 @@ PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.AP ...@@ -55,20 +55,26 @@ PICKUP.getReportWithWarningsListApiUrl = PICKUP.baseApiUrl + CONSTANT.URL.CMS.AP
/** /**
* Call get new report list api get data * Call get new report list api get data
*/ */
PICKUP.getNewreportListData = function (callback) { PICKUP.getNewreportListData = function (callback) {
let param = { let param = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
COMMON.cmsAjax(PICKUP.getNewReportListApiUrl, param, false, function (json) { COMMON.cmsAjax(
PICKUP.getNewReportListApiUrl,
param,
false,
function (json) {
if (callback) { if (callback) {
callback(json); callback(json);
} }
}, function() { },
function () {
console.log('DASHBOARD.getNewreportListData error'); console.log('DASHBOARD.getNewreportListData error');
if (callback) { if (callback) {
callback(PICKUP.defaultPickupList); callback(PICKUP.defaultPickupList);
} }
}); },
);
}; };
/** /**
* Call get Continuous Work list api get data * Call get Continuous Work list api get data
...@@ -78,16 +84,22 @@ PICKUP.getContinuousWorkListData = function (callback) { ...@@ -78,16 +84,22 @@ PICKUP.getContinuousWorkListData = function (callback) {
let param = { let param = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
COMMON.cmsAjax(PICKUP.getContinuousWorkListApiUrl, param, false, function (json) { COMMON.cmsAjax(
PICKUP.getContinuousWorkListApiUrl,
param,
false,
function (json) {
if (callback) { if (callback) {
callback(json); callback(json);
} }
}, function() { },
function () {
console.log('DASHBOARD.getContinuousWorkListData error'); console.log('DASHBOARD.getContinuousWorkListData error');
if (callback) { if (callback) {
callback(PICKUP.defaultPickupList); callback(PICKUP.defaultPickupList);
} }
}); },
);
}; };
/** /**
...@@ -98,24 +110,34 @@ PICKUP.getReportWithWarningsListData = function (callback) { ...@@ -98,24 +110,34 @@ PICKUP.getReportWithWarningsListData = function (callback) {
let param = { let param = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
COMMON.cmsAjax(PICKUP.getReportWithWarningsListApiUrl, param, false, function (json) { COMMON.cmsAjax(
PICKUP.getReportWithWarningsListApiUrl,
param,
false,
function (json) {
if (callback) { if (callback) {
callback(json); callback(json);
} }
}, function() { },
function () {
console.log('DASHBOARD.getReportWithWarningListData error'); console.log('DASHBOARD.getReportWithWarningListData error');
if (callback) { if (callback) {
callback(PICKUP.defaultPickupList); callback(PICKUP.defaultPickupList);
} }
}); },
);
}; };
/** /**
* Initialization pickup html * Initialization pickup html
*/ */
PICKUP.init = function() { PICKUP.init = function () {
console.log("PICKUP.init"); //Check if user is logged in
TEMPLATE.loadHearder("#includedHeader"); COMMON.checkAuth(false);
TEMPLATE.loadConfirmModal("#includedConfirmModal");
console.log('PICKUP.init');
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
TEMPLATE.loadHearder('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
...@@ -125,54 +147,50 @@ PICKUP.init = function() { ...@@ -125,54 +147,50 @@ PICKUP.init = function() {
titleLang: 'pickup', titleLang: 'pickup',
}, },
]; ];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "pickup", navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'pickup', navs, null);
PICKUP.initSettingActivePickup(); PICKUP.initSettingActivePickup();
PICKUP.settingPickup(); PICKUP.settingPickup();
} };
/** /**
* Setting pickup data * Setting pickup data
*/ */
PICKUP.settingPickup = function() { PICKUP.settingPickup = function () {
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
$("#liTabNewReport").addClass('d-none'); $('#liTabNewReport').addClass('d-none');
$("#liTabContinousWork").addClass('d-none'); $('#liTabContinousWork').addClass('d-none');
$("#liTabReportWithWarning").addClass('d-none'); $('#liTabReportWithWarning').addClass('d-none');
if(settings.newReport) if (settings.newReport) {
{ $('#liTabNewReport').removeClass('d-none');
$("#liTabNewReport").removeClass('d-none');
PICKUP.initNewReportTab(); PICKUP.initNewReportTab();
} }
if(settings.continousWork) if (settings.continousWork) {
{ $('#liTabContinousWork').removeClass('d-none');
$("#liTabContinousWork").removeClass('d-none');
PICKUP.initContinuosWorkTab(); PICKUP.initContinuosWorkTab();
} }
if(settings.warningReport) if (settings.warningReport) {
{ $('#liTabReportWithWarning').removeClass('d-none');
$("#liTabReportWithWarning").removeClass('d-none');
PICKUP.initReportWithWarningsTab(); PICKUP.initReportWithWarningsTab();
} }
}); });
} };
/** /**
* init Setting Active Pickup * init Setting Active Pickup
*/ */
PICKUP.initSettingActivePickup = function() { PICKUP.initSettingActivePickup = function () {
var urlParam = COMMON.getUrlParameter(); var urlParam = COMMON.getUrlParameter();
if(urlParam.pickupActive == undefined || urlParam.pickupActive == '' ) if (urlParam.pickupActive == undefined || urlParam.pickupActive == '') {
{
urlParam.pickupActive = PICKUP.pickupDefault; urlParam.pickupActive = PICKUP.pickupDefault;
} }
PICKUP.pickupActive = urlParam.pickupActive; PICKUP.pickupActive = urlParam.pickupActive;
PICKUP.settingActivePickup(PICKUP.pickupActive); PICKUP.settingActivePickup(PICKUP.pickupActive);
} };
/** /**
* setting Active Pickup * setting Active Pickup
* @param {*} pickupActive * @param {*} pickupActive
* @returns * @returns
*/ */
PICKUP.settingActivePickup = function(pickupActive) { PICKUP.settingActivePickup = function (pickupActive) {
PICKUP.pickupActive = pickupActive; PICKUP.pickupActive = pickupActive;
$('#liTabNewReport a').removeClass('active'); $('#liTabNewReport a').removeClass('active');
$('#liTabContinousWork a').removeClass('active'); $('#liTabContinousWork a').removeClass('active');
...@@ -182,181 +200,167 @@ PICKUP.settingActivePickup = function(pickupActive) { ...@@ -182,181 +200,167 @@ PICKUP.settingActivePickup = function(pickupActive) {
$('#tab-content-ContinousWork').removeClass('active show'); $('#tab-content-ContinousWork').removeClass('active show');
$('#tab-content-ReportWithWarnings').removeClass('active show'); $('#tab-content-ReportWithWarnings').removeClass('active show');
if(pickupActive == "newReport") if (pickupActive == 'newReport') {
{
$('#liTabNewReport a').addClass('active'); $('#liTabNewReport a').addClass('active');
$('#tab-content-NewReport').addClass('active show'); $('#tab-content-NewReport').addClass('active show');
return; return;
} }
if(pickupActive == "continousWork") if (pickupActive == 'continousWork') {
{
$('#liTabContinousWork a').addClass('active'); $('#liTabContinousWork a').addClass('active');
$('#tab-content-ContinousWork').addClass('active show'); $('#tab-content-ContinousWork').addClass('active show');
return; return;
} }
if(pickupActive == "reportWarning") if (pickupActive == 'reportWarning') {
{
$('#liTabReportWithWarning a').addClass('active'); $('#liTabReportWithWarning a').addClass('active');
$('#tab-content-ReportWithWarnings').addClass('active show'); $('#tab-content-ReportWithWarnings').addClass('active show');
return; return;
} }
} };
/** /**
* Initialization show not found pickup item html * Initialization show not found pickup item html
* @param {*} elementId * @param {*} elementId
*/ */
PICKUP.showNotFoundPickupItem = function(elementId) { PICKUP.showNotFoundPickupItem = function (elementId) {
$(elementId).removeClass(); $(elementId).removeClass();
$(elementId).addClass('p-0 mt-3 card-list'); $(elementId).addClass('p-0 mt-3 card-list');
let li = $("<li class='card mb-2 not-found'></li>"); let li = $("<li class='card mb-2 not-found'></li>");
let div = $("<div class='text-dark mb-1 px-3 py-5 text-center m-auto'></div>"); let div = $("<div class='text-dark mb-1 px-3 py-5 text-center m-auto'></div>");
let imgdiv = $("<img src=\"../common/img/icon_not_found.svg\" alt='" + I18N.i18nText('msgNotFound') +"' class='not-found-img mb-2'>"); let imgdiv = $('<img src="../common/img/icon_not_found.svg" alt=\'' + I18N.i18nText('msgNotFound') + "' class='not-found-img mb-2'>");
let childDiv = $("<div class='fs-9 text-secondary font-weight-bold'>" + I18N.i18nText('msgNotFound') +"</div>"); let childDiv = $("<div class='fs-9 text-secondary font-weight-bold'>" + I18N.i18nText('msgNotFound') + '</div>');
div.append(imgdiv); div.append(imgdiv);
div.append(childDiv); div.append(childDiv);
li.append(div); li.append(div);
$(elementId).append(li); $(elementId).append(li);
} };
/** /**
* Initialization view pickup menu html * Initialization view pickup menu html
* @param {*} elementId * @param {*} elementId
* @param {*} count * @param {*} count
*/ */
PICKUP.showCountDisplayPickupItem = function(elementId, count) { PICKUP.showCountDisplayPickupItem = function (elementId, count) {
let span = $('<span>' + I18N.i18nText('display') +'</span>'); let span = $('<span>' + I18N.i18nText('display') + '</span>');
$(elementId).append(count); $(elementId).append(count);
$(elementId).append(span); $(elementId).append(span);
} };
/** /**
* Initialization new report list html * Initialization new report list html
*/ */
PICKUP.initNewReportTab = function() { PICKUP.initNewReportTab = function () {
PICKUP.getNewreportListData(function (json) { PICKUP.getNewreportListData(function (json) {
PICKUP.createNewReportList(json.operationList); PICKUP.createNewReportList(json.operationList);
}); });
} };
/** /**
* Initialization continuous work list html * Initialization continuous work list html
*/ */
PICKUP.initContinuosWorkTab = function() { PICKUP.initContinuosWorkTab = function () {
PICKUP.getContinuousWorkListData(function (json) { PICKUP.getContinuousWorkListData(function (json) {
PICKUP.createContinousWorkList(json.operationList); PICKUP.createContinousWorkList(json.operationList);
}); });
} };
/** /**
* Initialization continuous work list html * Initialization continuous work list html
*/ */
PICKUP.initReportWithWarningsTab = function() { PICKUP.initReportWithWarningsTab = function () {
PICKUP.getReportWithWarningsListData(function (json) { PICKUP.getReportWithWarningsListData(function (json) {
PICKUP.createReportWithWarningList(json.operationList); PICKUP.createReportWithWarningList(json.operationList);
}); });
} };
/** /**
* sort New report operation list * sort New report operation list
* @param {*} operationList * @param {*} operationList
* @returns * @returns
*/ */
PICKUP.sortNewReportList = function(operationList) { PICKUP.sortNewReportList = function (operationList) {
operationList = operationList.sort(function(a,b) { operationList = operationList.sort(function (a, b) {
if (a.operationId < b.operationId) return 1; if (a.operationId < b.operationId) return 1;
if (a.operationId > b.operationId) return -1; if (a.operationId > b.operationId) return -1;
return 0; return 0;
}); });
return operationList; return operationList;
} };
/** /**
* Implement new report list html * Implement new report list html
* @param {*} operationListOld * @param {*} operationListOld
* @returns * @returns
*/ */
PICKUP.createNewReportList = function(operationListOld) { PICKUP.createNewReportList = function (operationListOld) {
if (typeof operationListOld === 'undefined' || operationListOld.length < 1) { if (typeof operationListOld === 'undefined' || operationListOld.length < 1) {
PICKUP.showNotFoundPickupItem("#newReport-list"); PICKUP.showNotFoundPickupItem('#newReport-list');
$('#viewMenuNewReport').addClass('d-none'); $('#viewMenuNewReport').addClass('d-none');
return; return;
} }
let operationList = PICKUP.sortNewReportList(operationListOld); let operationList = PICKUP.sortNewReportList(operationListOld);
$('#viewMenuNewReport').removeClass('d-none'); $('#viewMenuNewReport').removeClass('d-none');
$("#newReport-list").empty(); $('#newReport-list').empty();
PICKUP.countNewReportList = 0; PICKUP.countNewReportList = 0;
$('#newReport-list').addClass('task-list view-content view-block'); $('#newReport-list').addClass('task-list view-content view-block');
let classIcon ; let classIcon;
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
switch (operationList[i].reportType) switch (operationList[i].reportType) {
{
case PICKUP.REPORT_TYPE.REPORTONLY: case PICKUP.REPORT_TYPE.REPORTONLY:
classIcon = "report"; classIcon = 'report';
break; break;
case PICKUP.REPORT_TYPE.INSPECT: case PICKUP.REPORT_TYPE.INSPECT:
classIcon = "inspection"; classIcon = 'inspection';
break; break;
case PICKUP.REPORT_TYPE.WITHREPLY: case PICKUP.REPORT_TYPE.WITHREPLY:
classIcon = "questionary"; classIcon = 'questionary';
break; break;
case PICKUP.REPORT_TYPE.WORKFLOW: case PICKUP.REPORT_TYPE.WORKFLOW:
classIcon = "proccess"; classIcon = 'proccess';
break; break;
} }
let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>"); let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
let ahrefRequiredFlg = $("<a href=\"javascript:PICKUP.sendReportFormFromNewReport ('" let ahrefRequiredFlg = $(
+ operationList[i].operationId +"');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>"); '<a href="javascript:PICKUP.sendReportFormFromNewReport (\'' + operationList[i].operationId + "');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>",
let divIcon = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'>" );
+ "<div class='type-icon'>" let divIcon = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'>" + "<div class='type-icon'>" + "<span class='" + classIcon + "'></span>" + '</div></div>');
+ "<span class='" + classIcon + "'></span>"
+ "</div></div>") let divText = $(
"<div class='pl-5 h-100 d-flex align-items-center'>" + "<div class='w-100'>" + "<div class='fs-12 text-truncate'>" + operationList[i].operationName + '</div>' + '</div></div>',
let divText = $("<div class='pl-5 h-100 d-flex align-items-center'>" );
+ "<div class='w-100'>"
+ "<div class='fs-12 text-truncate'>" + operationList[i].operationName + "</div>"
+ "</div></div>");
ahrefRequiredFlg.append(divIcon); ahrefRequiredFlg.append(divIcon);
ahrefRequiredFlg.append(divText); ahrefRequiredFlg.append(divText);
messageli.append(ahrefRequiredFlg); messageli.append(ahrefRequiredFlg);
$("#newReport-list").append(messageli); $('#newReport-list').append(messageli);
PICKUP.countNewReportList = PICKUP.countNewReportList + 1; PICKUP.countNewReportList = PICKUP.countNewReportList + 1;
} }
// show not found if // show not found if
if (PICKUP.countNewReportList == 0) { if (PICKUP.countNewReportList == 0) {
PICKUP.showNotFoundPickupItem("#newReport-list"); PICKUP.showNotFoundPickupItem('#newReport-list');
$('#viewMenuNewReport').addClass('d-none'); $('#viewMenuNewReport').addClass('d-none');
return; return;
} }
PICKUP.showCountDisplayPickupItem("#count-NewReport", PICKUP.countNewReportList ) PICKUP.showCountDisplayPickupItem('#count-NewReport', PICKUP.countNewReportList);
};
}
/** /**
* sort continuous work operation list * sort continuous work operation list
* @param {*} operationList * @param {*} operationList
* @returns * @returns
*/ */
PICKUP.sortContinousWorkList = function(operationList) { PICKUP.sortContinousWorkList = function (operationList) {
let newOperationList = []; let newOperationList = [];
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
if (operationList[i].reportType === 3) if (operationList[i].reportType === 3) {
{ if (typeof operationList[i].processList === 'undefined') continue;
if(typeof operationList[i].processList === 'undefined' ) continue; if (operationList[i].processList && operationList[i].processList.length != 0) {
if (operationList[i].processList && operationList[i].processList.length != 0) for (let j = 0; j < operationList[i].processList.length; j++) {
{ if (typeof operationList[i].processList[j].phaseList === 'undefined') continue;
for( let j = 0; j < operationList[i].processList.length; j++ ) for (let g = 0; g < operationList[i].processList[j].phaseList.length; g++) {
{ if (operationList[i].processList[j].phaseList[g].phaseStatus != 999) {
if(typeof operationList[i].processList[j].phaseList === 'undefined' ) continue; let item = {
for(let g = 0; g < operationList[i].processList[j].phaseList.length; g++ ) reportType: operationList[i].reportType,
{
if(operationList[i].processList[j].phaseList[g].phaseStatus != 999)
{
let item = {reportType: operationList[i].reportType,
operationType: operationList[i].operationType, operationType: operationList[i].operationType,
phaseList: operationList[i].processList[j].phaseList, phaseList: operationList[i].processList[j].phaseList,
processKey: operationList[i].processList[j].processKey, processKey: operationList[i].processList[j].processKey,
...@@ -369,23 +373,21 @@ PICKUP.sortContinousWorkList = function(operationList) { ...@@ -369,23 +373,21 @@ PICKUP.sortContinousWorkList = function(operationList) {
taskName: operationList[i].processList[j].taskName, taskName: operationList[i].processList[j].taskName,
updateDate: operationList[i].processList[j].phaseList[g].updateDate, updateDate: operationList[i].processList[j].phaseList[g].updateDate,
phaseNo: operationList[i].processList[j].phaseList[g].phaseNo, phaseNo: operationList[i].processList[j].phaseList[g].phaseNo,
phaseName: operationList[i].processList[j].phaseList[g].phaseName phaseName: operationList[i].processList[j].phaseList[g].phaseName,
}; };
newOperationList.push(item); newOperationList.push(item);
} }
} }
} }
} }
} }
} }
newOperationList = newOperationList.sort(function(a,b) { newOperationList = newOperationList.sort(function (a, b) {
if (!a.updateDate) { if (!a.updateDate) {
a.updateDate = "1900-01-01 00:00:00"; a.updateDate = '1900-01-01 00:00:00';
} }
if (!b.updateDate) { if (!b.updateDate) {
b.updateDate = "1900-01-01 00:00:00"; b.updateDate = '1900-01-01 00:00:00';
} }
if (a.updateDate < b.updateDate) return 1; if (a.updateDate < b.updateDate) return 1;
if (a.updateDate > b.updateDate) return -1; if (a.updateDate > b.updateDate) return -1;
...@@ -393,23 +395,23 @@ PICKUP.sortContinousWorkList = function(operationList) { ...@@ -393,23 +395,23 @@ PICKUP.sortContinousWorkList = function(operationList) {
}); });
//console.log("newOperationList: " + JSON.stringify(newOperationList)); //console.log("newOperationList: " + JSON.stringify(newOperationList));
return newOperationList; return newOperationList;
} };
/** /**
* Implement continous work html * Implement continous work html
* @param {*} operationListOld * @param {*} operationListOld
* @returns * @returns
*/ */
PICKUP.createContinousWorkList = function(operationListOld) { PICKUP.createContinousWorkList = function (operationListOld) {
if (typeof operationListOld === 'undefined' || operationListOld.length < 1) { if (typeof operationListOld === 'undefined' || operationListOld.length < 1) {
PICKUP.showNotFoundPickupItem("#continousWork-list"); PICKUP.showNotFoundPickupItem('#continousWork-list');
$('#viewMenuContinuousWork').addClass('d-none'); $('#viewMenuContinuousWork').addClass('d-none');
return; return;
} }
let operationList = PICKUP.sortContinousWorkList(operationListOld); let operationList = PICKUP.sortContinousWorkList(operationListOld);
$('#viewMenuContinuousWork').removeClass('d-none'); $('#viewMenuContinuousWork').removeClass('d-none');
$("#continousWork-list").empty(); $('#continousWork-list').empty();
PICKUP.countContinousWorkReport = 0; PICKUP.countContinousWorkReport = 0;
...@@ -420,29 +422,35 @@ PICKUP.createContinousWorkList = function(operationListOld) { ...@@ -420,29 +422,35 @@ PICKUP.createContinousWorkList = function(operationListOld) {
if (operationList[i].operationType == PICKUP.OPERATION_TYPE.VTOUR || operationList[i].operationType == PICKUP.OPERATION_TYPE.PDF) { if (operationList[i].operationType == PICKUP.OPERATION_TYPE.VTOUR || operationList[i].operationType == PICKUP.OPERATION_TYPE.PDF) {
directKey = operationList[i].taskKey; directKey = operationList[i].taskKey;
} }
let messageli = $("<li class='card mb-2' id = 'list_" + operationList[i].processKey + "$" + operationList[i].phaseNo + "'></li>") ; let messageli = $("<li class='card mb-2' id = 'list_" + operationList[i].processKey + '$' + operationList[i].phaseNo + "'></li>");
let ahrefRequiredFlg ; let ahrefRequiredFlg;
if (operationList[i].permitCodeRequiredFlg == 1) if (operationList[i].permitCodeRequiredFlg == 1) {
{
ahrefRequiredFlg = $("<a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>"); ahrefRequiredFlg = $("<a href=\"javascript:CHK.displayAlert('onlyRfid');\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>");
} } else {
else ahrefRequiredFlg = $(
{ '<a href="javascript:PICKUP.sendReportFormFromContinuousWork (\'' +
ahrefRequiredFlg = $("<a href=\"javascript:PICKUP.sendReportFormFromContinuousWork ('" operationList[i].operationId +
+ operationList[i].operationId +"','" + operationList[i].taskKey + "','" + operationList[i].processKey + "'," + operationList[i].phaseNo + ");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>"); "','" +
operationList[i].taskKey +
"','" +
operationList[i].processKey +
"'," +
operationList[i].phaseNo +
");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'></a>",
);
} }
let divProccess = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'><span class='proccess'></span></div></div>"); let divProccess = $("<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'><span class='proccess'></span></div></div>");
let divInfor = $("<div class='pl-5 h-100 d-flex align-items-center'></div>"); let divInfor = $("<div class='pl-5 h-100 d-flex align-items-center'></div>");
let divChildInfor = $("<div class='w-100'></div>"); let divChildInfor = $("<div class='w-100'></div>");
let divOperationName = $("<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" + operationList[i].phaseName + "</div>"); let divOperationName = $("<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" + operationList[i].phaseName + '</div>');
let divProcessName = $("<div class='fs-12 text-truncate'>" + operationList[i].operationName + "</div>"); let divProcessName = $("<div class='fs-12 text-truncate'>" + operationList[i].operationName + '</div>');
let divReportInfor = $("<div class='d-flex justify-content-between align-items-center'></div>"); let divReportInfor = $("<div class='d-flex justify-content-between align-items-center'></div>");
let divReportName = $("<div class='fs-10 text-truncate'>" + operationList[i].taskName + "</div>"); let divReportName = $("<div class='fs-10 text-truncate'>" + operationList[i].taskName + '</div>');
let divReportCode = $("<div class='fs-8 text-secondary text-truncate'>" + operationList[i].taskCode + "</div>"); let divReportCode = $("<div class='fs-8 text-secondary text-truncate'>" + operationList[i].taskCode + '</div>');
divReportInfor.append(divReportName); divReportInfor.append(divReportName);
divReportInfor.append(divReportCode); divReportInfor.append(divReportCode);
...@@ -457,32 +465,31 @@ PICKUP.createContinousWorkList = function(operationListOld) { ...@@ -457,32 +465,31 @@ PICKUP.createContinousWorkList = function(operationListOld) {
ahrefRequiredFlg.append(divInfor); ahrefRequiredFlg.append(divInfor);
messageli.append(ahrefRequiredFlg); messageli.append(ahrefRequiredFlg);
$("#continousWork-list").append(messageli); $('#continousWork-list').append(messageli);
PICKUP.countContinousWorkReport = PICKUP.countContinousWorkReport + 1; PICKUP.countContinousWorkReport = PICKUP.countContinousWorkReport + 1;
} }
// show not found if // show not found if
if (PICKUP.countContinousWorkReport == 0) { if (PICKUP.countContinousWorkReport == 0) {
PICKUP.showNotFoundPickupItem("#continousWork-list"); PICKUP.showNotFoundPickupItem('#continousWork-list');
$('#viewMenuContinuousWork').addClass('d-none'); $('#viewMenuContinuousWork').addClass('d-none');
return; return;
} }
PICKUP.showCountDisplayPickupItem("#count-ContinuousWork", PICKUP.countContinousWorkReport ) PICKUP.showCountDisplayPickupItem('#count-ContinuousWork', PICKUP.countContinousWorkReport);
}; };
/** /**
* sort report with warnings list * sort report with warnings list
* @param {*} operationList * @param {*} operationList
* @returns * @returns
*/ */
PICKUP.sortWarningList = function(operationList) { PICKUP.sortWarningList = function (operationList) {
let newOperationList = []; let newOperationList = [];
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
if(typeof operationList[i].warningReportList === 'undefined' ) continue; if (typeof operationList[i].warningReportList === 'undefined') continue;
if (operationList[i].warningReportList && operationList[i].warningReportList.length != 0) if (operationList[i].warningReportList && operationList[i].warningReportList.length != 0) {
{ for (let j = 0; j < operationList[i].warningReportList.length; j++) {
for( let j = 0; j < operationList[i].warningReportList.length; j++ ) let item = {
{ reportType: operationList[i].reportType,
let item = {reportType: operationList[i].reportType,
operationType: operationList[i].operationType, operationType: operationList[i].operationType,
permitCodeRequiredFlg: operationList[i].permitCodeRequiredFlg, permitCodeRequiredFlg: operationList[i].permitCodeRequiredFlg,
operationId: operationList[i].operationId, operationId: operationList[i].operationId,
...@@ -497,18 +504,18 @@ PICKUP.sortWarningList = function(operationList) { ...@@ -497,18 +504,18 @@ PICKUP.sortWarningList = function(operationList) {
reportEndDateString: operationList[i].warningReportList[j].reportEndDateString, reportEndDateString: operationList[i].warningReportList[j].reportEndDateString,
processKey: operationList[i].warningReportList[j].processKey, processKey: operationList[i].warningReportList[j].processKey,
phaseNo: operationList[i].warningReportList[j].phaseNo, phaseNo: operationList[i].warningReportList[j].phaseNo,
phaseName: operationList[i].warningReportList[j].phaseName phaseName: operationList[i].warningReportList[j].phaseName,
}; };
newOperationList.push(item); newOperationList.push(item);
} }
} }
} }
newOperationList = newOperationList.sort(function(a,b) { newOperationList = newOperationList.sort(function (a, b) {
if (!a.updateDate) { if (!a.updateDate) {
a.updateDate = "1900-01-01 00:00:00"; a.updateDate = '1900-01-01 00:00:00';
} }
if (!b.updateDate) { if (!b.updateDate) {
b.updateDate = "1900-01-01 00:00:00"; b.updateDate = '1900-01-01 00:00:00';
} }
if (a.updateDate < b.updateDate) return 1; if (a.updateDate < b.updateDate) return 1;
if (a.updateDate > b.updateDate) return -1; if (a.updateDate > b.updateDate) return -1;
...@@ -516,69 +523,109 @@ PICKUP.sortWarningList = function(operationList) { ...@@ -516,69 +523,109 @@ PICKUP.sortWarningList = function(operationList) {
}); });
//console.log("newOperationList: " + JSON.stringify(newOperationList)); //console.log("newOperationList: " + JSON.stringify(newOperationList));
return newOperationList; return newOperationList;
} };
/** /**
* init Warning Report With ReportOnly Type * init Warning Report With ReportOnly Type
* @param {*} report * @param {*} report
* @returns * @returns
*/ */
PICKUP.initWarningReportWithReportOnlyType = function(report) { PICKUP.initWarningReportWithReportOnlyType = function (report) {
let ele = $("<li class='card mb-2'>" let ele = $(
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" "<li class='card mb-2'>" +
+ report.operationId +"'," + PICKUP.REPORT_TYPE.REPORTONLY + ",'" + report.taskKey + "', null,null,null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" '<a href="javascript:PICKUP.sendReportFormFromWarningReport (\'' +
+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>" report.operationId +
+ "<div class='type-icon'><span class='report'></span></div></div>" "'," +
+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" PICKUP.REPORT_TYPE.REPORTONLY +
+ "<div class='fs-12 text-truncate'>" + report.operationName + "</div>" ",'" +
+ "<div class='d-flex justify-content-between align-items-center'>" report.taskKey +
+ "<div class='fs-10 text-truncate'>" + report.taskName+ "</div>" "', null,null,null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" +
+ "<div class='fs-8 text-secondary text-truncate'> " + report.taskCode + "</div>" "<div class='position-absolute translate-middle top-50 left-0 ml-3'>" +
+ "</div></div></div></a></li>"); "<div class='type-icon'><span class='report'></span></div></div>" +
"<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" +
"<div class='fs-12 text-truncate'>" +
report.operationName +
'</div>' +
"<div class='d-flex justify-content-between align-items-center'>" +
"<div class='fs-10 text-truncate'>" +
report.taskName +
'</div>' +
"<div class='fs-8 text-secondary text-truncate'> " +
report.taskCode +
'</div>' +
'</div></div></div></a></li>',
);
return ele; return ele;
} };
PICKUP.initWarningReportWithInspectType = function(report) { PICKUP.initWarningReportWithInspectType = function (report) {
let ele = $("<li class='card mb-2'>" let ele = $(
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" "<li class='card mb-2'>" +
+ report.operationId +"'," + PICKUP.REPORT_TYPE.INSPECT + ",'" + report.taskKey + "', null,null,null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" '<a href="javascript:PICKUP.sendReportFormFromWarningReport (\'' +
+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>" report.operationId +
+ "<div class='type-icon'><span class='inspection'></span></div></div>" "'," +
+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" PICKUP.REPORT_TYPE.INSPECT +
+ "<div class='fs-12 text-truncate'>" + report.operationName + "</div>" ",'" +
+ "<div class='d-flex justify-content-between align-items-center'>" report.taskKey +
+ "<div class='fs-10 text-truncate'></div>" "', null,null,null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" +
+ "<div class='fs-8 text-secondary text-truncate'>" + PICKUP.getInspectDate(report.reportStartDateString) + " ～ " + PICKUP.getInspectDate(report.reportEndDateString) "<div class='position-absolute translate-middle top-50 left-0 ml-3'>" +
+ "</div></div></div></div></a></li>"); "<div class='type-icon'><span class='inspection'></span></div></div>" +
"<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" +
"<div class='fs-12 text-truncate'>" +
report.operationName +
'</div>' +
"<div class='d-flex justify-content-between align-items-center'>" +
"<div class='fs-10 text-truncate'></div>" +
"<div class='fs-8 text-secondary text-truncate'>" +
PICKUP.getInspectDate(report.reportStartDateString) +
' ～ ' +
PICKUP.getInspectDate(report.reportEndDateString) +
'</div></div></div></div></a></li>',
);
return ele; return ele;
} };
/** /**
* init Warning Report With AnswerReport Type * init Warning Report With AnswerReport Type
* @param {*} report * @param {*} report
* @param {*} reportTypeMsg * @param {*} reportTypeMsg
* @returns * @returns
*/ */
PICKUP.initWarningReportWithAnswerReportType = function(report, reportTypeMsg) { PICKUP.initWarningReportWithAnswerReportType = function (report, reportTypeMsg) {
let ele = $("<li class='card mb-2'>" let ele = $(
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" "<li class='card mb-2'>" +
+ report.operationId +"'," + PICKUP.REPORT_TYPE.WITHREPLY + ",null, null,null," + report.replyNo +");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" '<a href="javascript:PICKUP.sendReportFormFromWarningReport (\'' +
+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'>" report.operationId +
+ "<span class='questionary'></span></div></div><div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" "'," +
+ "<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" + reportTypeMsg + "</div>" PICKUP.REPORT_TYPE.WITHREPLY +
+ "<div class='fs-12 text-truncate'>" + report.operationName + "</div>" ',null, null,null,' +
+ "<div class='d-flex justify-content-between align-items-center'>" report.replyNo +
+ "<div class='fs-10 text-truncate'>" + report.taskName+ "</div>" ");\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" +
+ "<div class='fs-8 text-secondary text-truncate'>" + report.taskCode+ "</div>" "<div class='position-absolute translate-middle top-50 left-0 ml-3'><div class='type-icon'>" +
+ "</div></div></div></a></li>"); "<span class='questionary'></span></div></div><div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" +
"<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" +
reportTypeMsg +
'</div>' +
"<div class='fs-12 text-truncate'>" +
report.operationName +
'</div>' +
"<div class='d-flex justify-content-between align-items-center'>" +
"<div class='fs-10 text-truncate'>" +
report.taskName +
'</div>' +
"<div class='fs-8 text-secondary text-truncate'>" +
report.taskCode +
'</div>' +
'</div></div></div></a></li>',
);
return ele; return ele;
} };
/** /**
* init Warning Report With Continuous Report Type * init Warning Report With Continuous Report Type
* @param {*} report * @param {*} report
* @returns * @returns
*/ */
PICKUP.initWarningReportWithContinuousReportType = function(report) { PICKUP.initWarningReportWithContinuousReportType = function (report) {
let directKey = report.processKey; let directKey = report.processKey;
if (report.operationType == PICKUP.OPERATION_TYPE.VTOUR || report.operationType == PICKUP.OPERATION_TYPE.PDF) { if (report.operationType == PICKUP.OPERATION_TYPE.VTOUR || report.operationType == PICKUP.OPERATION_TYPE.PDF) {
directKey = report.taskKey; directKey = report.taskKey;
...@@ -592,36 +639,52 @@ PICKUP.initWarningReportWithContinuousReportType = function(report) { ...@@ -592,36 +639,52 @@ PICKUP.initWarningReportWithContinuousReportType = function(report) {
} }
} }
} }
let ele = $("<li class='card mb-2'>" let ele = $(
+ "<a href=\"javascript:PICKUP.sendReportFormFromWarningReport ('" "<li class='card mb-2'>" +
+ report.operationId +"'," + PICKUP.REPORT_TYPE.WORKFLOW + ",null,'" + report.processKey +"' ,'"+ report.phaseNo +"',null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" '<a href="javascript:PICKUP.sendReportFormFromWarningReport (\'' +
+ "<div class='position-absolute translate-middle top-50 left-0 ml-3'>" report.operationId +
+ "<div class='type-icon'><span class='proccess'></span></div></div>" "'," +
+ "<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" PICKUP.REPORT_TYPE.WORKFLOW +
+ "<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" + report.phaseName + "</div>" ",null,'" +
+ "<div class='fs-12 text-truncate'>" + report.operationName + "</div>" report.processKey +
+ "<div class='d-flex justify-content-between align-items-center'>" "' ,'" +
+ "<div class='fs-10 text-truncate'>" + report.taskName+ "</div>" report.phaseNo +
+ "<div class='fs-8 text-secondary text-truncate'>" + report.taskCode+ "</div>" "',null);\" class='h-100 d-block px-3 py-2 text-decoration-none text-dark position-relative'>" +
+ "</div></div></div></a></li>"); "<div class='position-absolute translate-middle top-50 left-0 ml-3'>" +
"<div class='type-icon'><span class='proccess'></span></div></div>" +
"<div class='pl-5 h-100 d-flex align-items-center'><div class='w-100'>" +
"<div class='fs-8 bg-dark10 px-2 py-1 mr-2 rounded mb-1 w-fit-content text-truncate mw-100'>" +
report.phaseName +
'</div>' +
"<div class='fs-12 text-truncate'>" +
report.operationName +
'</div>' +
"<div class='d-flex justify-content-between align-items-center'>" +
"<div class='fs-10 text-truncate'>" +
report.taskName +
'</div>' +
"<div class='fs-8 text-secondary text-truncate'>" +
report.taskCode +
'</div>' +
'</div></div></div></a></li>',
);
return ele; return ele;
} };
/** /**
* create Report With Warnings List html * create Report With Warnings List html
* @param {*} operationListOld * @param {*} operationListOld
* @returns * @returns
*/ */
PICKUP.createReportWithWarningList = function(operationListOld) { PICKUP.createReportWithWarningList = function (operationListOld) {
if (typeof operationListOld === 'undefined' || operationListOld.length < 1) { if (typeof operationListOld === 'undefined' || operationListOld.length < 1) {
PICKUP.showNotFoundPickupItem("#reportWithWarnings-list"); PICKUP.showNotFoundPickupItem('#reportWithWarnings-list');
$('#viewMenuReportWithWarnings').addClass('d-none'); $('#viewMenuReportWithWarnings').addClass('d-none');
return; return;
} }
let operationList = PICKUP.sortWarningList(operationListOld); let operationList = PICKUP.sortWarningList(operationListOld);
$('#viewMenuReportWithWarnings').removeClass('d-none'); $('#viewMenuReportWithWarnings').removeClass('d-none');
$("#reportWithWarnings-list").empty(); $('#reportWithWarnings-list').empty();
PICKUP.countReportWithWarning = 0; PICKUP.countReportWithWarning = 0;
$('#reportWithWarnings-list').addClass('task-list view-content view-block'); $('#reportWithWarnings-list').addClass('task-list view-content view-block');
...@@ -630,8 +693,7 @@ PICKUP.createReportWithWarningList = function(operationListOld) { ...@@ -630,8 +693,7 @@ PICKUP.createReportWithWarningList = function(operationListOld) {
const msgLevelAnswer = I18N.i18nText('reportLevelAnswer'); const msgLevelAnswer = I18N.i18nText('reportLevelAnswer');
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
let operationNameLi; let operationNameLi;
switch (operationList[i].reportType) switch (operationList[i].reportType) {
{
case PICKUP.REPORT_TYPE.REPORTONLY: case PICKUP.REPORT_TYPE.REPORTONLY:
operationNameLi = PICKUP.initWarningReportWithReportOnlyType(operationList[i]); operationNameLi = PICKUP.initWarningReportWithReportOnlyType(operationList[i]);
break; break;
...@@ -639,31 +701,26 @@ PICKUP.createReportWithWarningList = function(operationListOld) { ...@@ -639,31 +701,26 @@ PICKUP.createReportWithWarningList = function(operationListOld) {
operationNameLi = PICKUP.initWarningReportWithInspectType(operationList[i]); operationNameLi = PICKUP.initWarningReportWithInspectType(operationList[i]);
break; break;
case PICKUP.REPORT_TYPE.WITHREPLY: // report answer case PICKUP.REPORT_TYPE.WITHREPLY: // report answer
if( operationList[i].taskType == PICKUP.REPLYREPORT_TASK_TYPE.REPORT ) if (operationList[i].taskType == PICKUP.REPLYREPORT_TASK_TYPE.REPORT) {
{
operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], msgLevelReport); operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], msgLevelReport);
} } else {
else
{
operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], msgLevelAnswer); operationNameLi = PICKUP.initWarningReportWithAnswerReportType(operationList[i], msgLevelAnswer);
} }
break; break;
case PICKUP.REPORT_TYPE.WORKFLOW: // continouswork case PICKUP.REPORT_TYPE.WORKFLOW: // continouswork
operationNameLi = PICKUP.initWarningReportWithContinuousReportType(operationList[i]); operationNameLi = PICKUP.initWarningReportWithContinuousReportType(operationList[i]);
break; break;
} }
$("#reportWithWarnings-list").append(operationNameLi); $('#reportWithWarnings-list').append(operationNameLi);
PICKUP.countReportWithWarning = PICKUP.countReportWithWarning + 1; PICKUP.countReportWithWarning = PICKUP.countReportWithWarning + 1;
} }
// show not found if // show not found if
if (PICKUP.countReportWithWarning == 0) { if (PICKUP.countReportWithWarning == 0) {
PICKUP.showNotFoundPickupItem("#reportWithWarnings-list"); PICKUP.showNotFoundPickupItem('#reportWithWarnings-list');
$('#viewMenuReportWithWarnings').addClass('d-none'); $('#viewMenuReportWithWarnings').addClass('d-none');
return; return;
} }
PICKUP.showCountDisplayPickupItem("#count-ReportWithWarnings", PICKUP.countReportWithWarning ) PICKUP.showCountDisplayPickupItem('#count-ReportWithWarnings', PICKUP.countReportWithWarning);
}; };
/** /**
...@@ -671,49 +728,49 @@ PICKUP.createReportWithWarningList = function(operationListOld) { ...@@ -671,49 +728,49 @@ PICKUP.createReportWithWarningList = function(operationListOld) {
* @param {*} dateString * @param {*} dateString
* @returns * @returns
*/ */
PICKUP.getInspectDate = function(dateString) { PICKUP.getInspectDate = function (dateString) {
let date = new Date(dateString) let date = new Date(dateString);
return date.getFullYear() + "/" + ("0" + (date.getMonth() + 1)).slice(-2) + "/" + ("0" + date.getDate()).slice(-2) ; return date.getFullYear() + '/' + ('0' + (date.getMonth() + 1)).slice(-2) + '/' + ('0' + date.getDate()).slice(-2);
} };
/** /**
* send data to open report form from New report pickup * send data to open report form from New report pickup
* @returns * @returns
*/ */
PICKUP.sendReportFormFromNewReport = function(operationId) { PICKUP.sendReportFormFromNewReport = function (operationId) {
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
let url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
COMMON.postCommunication(url, params); COMMON.postCommunication(url, params);
} };
/** /**
* send data to open report form of event click continuous work operation report * send data to open report form of event click continuous work operation report
* @returns * @returns
*/ */
PICKUP.sendReportFormFromContinuousWork = function(operationId, taskKey, processKey,phaseNo) { PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, processKey, phaseNo) {
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
params.processKey = processKey; params.processKey = processKey;
params.phaseNo = phaseNo; params.phaseNo = phaseNo;
let url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
COMMON.postCommunication(url, params); COMMON.postCommunication(url, params);
} };
/** /**
* send data to open report form of event click warning operation report * send data to open report form of event click warning operation report
* @returns * @returns
*/ */
PICKUP.sendReportFormFromWarningReport = function(operationId,reportType, taskKey, processKey,phaseNo, replyNo) { PICKUP.sendReportFormFromWarningReport = function (operationId, reportType, taskKey, processKey, phaseNo, replyNo) {
//Transition to the report form or operation list screen //Transition to the report form or operation list screen
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = operationId; params.operationId = operationId;
switch(reportType) { switch (reportType) {
case PICKUP.REPORT_TYPE.REPORTONLY: case PICKUP.REPORT_TYPE.REPORTONLY:
params.taskKey = taskKey; params.taskKey = taskKey;
break; break;
...@@ -728,6 +785,7 @@ PICKUP.sendReportFormFromContinuousWork = function(operationId, taskKey, process ...@@ -728,6 +785,7 @@ PICKUP.sendReportFormFromContinuousWork = function(operationId, taskKey, process
params.phaseNo = phaseNo; params.phaseNo = phaseNo;
break; break;
} }
let url = CONSTANT.URL.CMS.BASE + ClientData.userInfo_accountPath() + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM + '/' + CONSTANT.REPLY_NO.REPORT;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
COMMON.postCommunication(url, params); COMMON.postCommunication(url, params);
} };
abweb/js/pushMessageDetail/push-message-detail.js → abweb/js/pushMessageDetail/pushMessageDetail.js
/**
* js for pushing detailed messages
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
var PushMessageDetail = {}; var PushMessageDetail = {};
PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_DETAIL; PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PUSH_MESSAGE_DETAIL;
...@@ -7,18 +12,20 @@ PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Clie ...@@ -7,18 +12,20 @@ PushMessageDetail.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Clie
*/ */
PushMessageDetail.dummyMessageDetailJson = { PushMessageDetail.dummyMessageDetailJson = {
pushMessageId: 1, pushMessageId: 1,
pushMessage: "内容が入ります。内容が入ります。内容が入ります。内容が入ります。", pushMessage: '内容が入ります。内容が入ります。内容が入ります。内容が入ります。',
pushSendDate: "2022/07/06 14:14", pushSendDate: '2022/07/06 14:14',
operationName: "絞り検索", operationName: '絞り検索',
pushSendLoginId: "agentec" pushSendLoginId: 'agentec',
} };
/** /**
* init when html loaded * init when html loaded
*/ */
PushMessageDetail.init = function() { PushMessageDetail.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
//load common html //load common html
TEMPLATE.loadHearder("#includedHeader"); TEMPLATE.loadHearder('#includedHeader');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
...@@ -26,50 +33,56 @@ PushMessageDetail.init = function() { ...@@ -26,50 +33,56 @@ PushMessageDetail.init = function() {
}, },
{ {
titleLang: 'messageListTitle', titleLang: 'messageListTitle',
href: 'push-message-list.html', href: 'pushMessageList.html',
}, },
{ {
titleLang: 'messageDetail', titleLang: 'messageDetail',
}, },
]; ];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "messageDetail", navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageDetail', navs, null);
//request message detail data //request message detail data
let urlParam = COMMON.getUrlParameter(); let urlParam = COMMON.getUrlParameter();
if (typeof urlParam !== 'object' || typeof urlParam.pushMessageId === 'undefined') { if (typeof urlParam !== 'object' || typeof urlParam.pushMessageId === 'undefined') {
return; return;
} }
PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function(message) { PushMessageDetail.getMessageDetail(urlParam.pushMessageId, function (message) {
PushMessageDetail.showMessage(message); PushMessageDetail.showMessage(message);
}); });
} };
/** /**
* request message data * request message data
* @param {string} pushMessageId * @param {string} pushMessageId
* @param {object} callback * @param {object} callback
*/ */
PushMessageDetail.getMessageDetail = function(pushMessageId, callback) { PushMessageDetail.getMessageDetail = function (pushMessageId, callback) {
let param = { let param = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
pushMessageId: pushMessageId pushMessageId: pushMessageId,
}; };
const url = PushMessageDetail.baseApiUrl; const url = PushMessageDetail.baseApiUrl;
COMMON.cmsAjax(url, param, true, function (json) { COMMON.cmsAjax(
url,
param,
true,
function (json) {
if (callback && json && json.pushMessage) { if (callback && json && json.pushMessage) {
callback(json.pushMessage); callback(json.pushMessage);
} }
}, function() { },
function () {
console.log('PushMessageDetail.getMessageDetail error'); console.log('PushMessageDetail.getMessageDetail error');
}); },
} );
};
/** /**
* Show message data * Show message data
* @param {object} message * @param {object} message
*/ */
PushMessageDetail.showMessage = function(message) { PushMessageDetail.showMessage = function (message) {
$('#content').text(message.pushMessage); $('#content').text(message.pushMessage);
$('#sendDate').text(message.pushSendDate); $('#sendDate').text(message.pushSendDate);
$('#operationName').text(message.operationName); $('#operationName').text(message.operationName);
$('#sender').text(message.pushSendLoginId); $('#sender').text(message.pushSendLoginId);
} };
abweb/js/pushMessageList/push-message-list.js → abweb/js/pushMessageList/pushMessageList.js
/** /**
* Push Message List JS in push-message-list.html * Push Message List JS in pushMessageList.html
* @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 PushMessageList = {}; var PushMessageList = {};
...@@ -8,8 +8,10 @@ PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Client ...@@ -8,8 +8,10 @@ PushMessageList.baseApiUrl = COMMON.format(ClientData.conf_checkApiUrl(), Client
/** /**
* Init when html onload * Init when html onload
*/ */
PushMessageList.init = function() { PushMessageList.init = function () {
TEMPLATE.loadHearder("#includedHeader"); //Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
...@@ -19,11 +21,11 @@ PushMessageList.init = function() { ...@@ -19,11 +21,11 @@ PushMessageList.init = function() {
titleLang: 'messageListTitle', titleLang: 'messageListTitle',
}, },
]; ];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "messageListTitle", navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'messageListTitle', navs, null);
PushMessageList.getMessageList(function(messageList) { PushMessageList.getMessageList(function (messageList) {
PushMessageList.generateMessageListHtml(messageList.pushMessageList); PushMessageList.generateMessageListHtml(messageList.pushMessageList);
}); });
} };
/** /**
* get Message List from CMS * get Message List from CMS
...@@ -34,29 +36,35 @@ PushMessageList.getMessageList = function (callback) { ...@@ -34,29 +36,35 @@ PushMessageList.getMessageList = function (callback) {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
const url = PushMessageList.baseApiUrl; const url = PushMessageList.baseApiUrl;
COMMON.cmsAjax(url, param, true, function (json) { COMMON.cmsAjax(
url,
param,
true,
function (json) {
if (callback) { if (callback) {
callback(json); callback(json);
} }
}, function() { },
function () {
console.log('PushMessageList.getMessageList error'); console.log('PushMessageList.getMessageList error');
}); },
);
}; };
/** /**
* handle click message event * handle click message event
* @param {string} pushMessageId * @param {string} pushMessageId
*/ */
PushMessageList.clickMessage = function(pushMessageId) { PushMessageList.clickMessage = function (pushMessageId) {
COMMON.goUrlWithCurrentParams('push-message-detail.html', {pushMessageId: pushMessageId}); COMMON.goUrlWithCurrentParams('pushMessageDetail.html', { pushMessageId: pushMessageId });
} };
/** /**
* generate message list html * generate message list html
* @param {array} messageList * @param {array} messageList
* @returns * @returns
*/ */
PushMessageList.generateMessageListHtml = function(messageList) { PushMessageList.generateMessageListHtml = function (messageList) {
if (typeof messageList === 'undefined' || messageList.length < 1) { if (typeof messageList === 'undefined' || messageList.length < 1) {
//show not found //show not found
$('#messageList .not-found').removeClass('d-none'); $('#messageList .not-found').removeClass('d-none');
...@@ -76,7 +84,7 @@ PushMessageList.generateMessageListHtml = function(messageList) { ...@@ -76,7 +84,7 @@ PushMessageList.generateMessageListHtml = function(messageList) {
messageLi.addClass('unread'); messageLi.addClass('unread');
} }
var messageA = $('<a class="d-block px-3 py-2 text-decoration-none text-dark"/>'); var messageA = $('<a class="d-block px-3 py-2 text-decoration-none text-dark"/>');
messageA.attr('href', "javascript:PushMessageList.clickMessage('" + messageId +"');"); messageA.attr('href', "javascript:PushMessageList.clickMessage('" + messageId + "');");
var titleDiv = $('<div class="fs-12 text-truncate">' + mTitle + '</div>'); var titleDiv = $('<div class="fs-12 text-truncate">' + mTitle + '</div>');
var subTitleMainDiv = $('<div class="d-flex justify-content-between align-items-center"></div>'); var subTitleMainDiv = $('<div class="d-flex justify-content-between align-items-center"></div>');
var subTitleDiv = $('<div class="fs-10 text-truncate">' + mSubtitle + '</div>'); var subTitleDiv = $('<div class="fs-10 text-truncate">' + mSubtitle + '</div>');
...@@ -94,17 +102,20 @@ PushMessageList.generateMessageListHtml = function(messageList) { ...@@ -94,17 +102,20 @@ PushMessageList.generateMessageListHtml = function(messageList) {
* dummy message list JSON for test * dummy message list JSON for test
*/ */
PushMessageList.dummyMessageListJson = { PushMessageList.dummyMessageListJson = {
pushMessageList: [{ pushMessageList: [
{
pushMessageId: 1, pushMessageId: 1,
pushMessage: 'メッセージ内容が入ります。', pushMessage: 'メッセージ内容が入ります。',
pushSendDate: '2022/07/06 14:14', pushSendDate: '2022/07/06 14:14',
operationName: '作業名が入ります。', operationName: '作業名が入ります。',
readingFlg: 0, readingFlg: 0,
}, { },
{
pushMessageId: 2, pushMessageId: 2,
pushMessage: 'メッセージ内容が入ります。メッセージ内容が入ります。メッセージ内容が入ります。メッセージ内容が入ります。', pushMessage: 'メッセージ内容が入ります。メッセージ内容が入ります。メッセージ内容が入ります。メッセージ内容が入ります。',
pushSendDate: 'xxxxxxxxxxxxxxxxxxxxxxxxxx', pushSendDate: 'xxxxxxxxxxxxxxxxxxxxxxxxxx',
operationName: '作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。', operationName: '作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。作業名が入ります。',
readingFlg: 1, readingFlg: 1,
}] },
],
}; };
abweb/js/reportForm/reportForm.js 0 → 100644
/**
* ReportForm function js
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
var RF = {};
RF.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
RF.loadCommon();
RF.initFormView();
};
RF.loadCommon = function () {
$('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../html/common/confirm-modal.html', function () {
I18N.initi18n();
});
};
RF.initFormView = function () {
const urlParameterList = COMMON.getUrlParameter();
const operationId = urlParameterList['operationId'];
if (operationId) {
let params = {};
const taskKey = urlParameterList['taskKey'];
const replyNo = urlParameterList['replyNo'];
const processKey = urlParameterList['processKey'];
const phaseNo = urlParameterList['phaseNo'];
params.sid = COMMON.getSid();
params.operationId = operationId;
if (taskKey) params.taskKey = taskKey;
if (replyNo) params.replyNo = replyNo;
if (processKey) params.processKey = processKey;
if (phaseNo) params.phaseNo = phaseNo;
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
$('#report-form').load(url, params, function () {
initPageLoad();
});
} else {
COMMON.avwScreenMove('index.html');
}
};
abweb/js/reportList/reportList.js
// ReportList function js /**
* ReportList function js
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
**/
var RL = {}; var RL = {};
RL.init = function() { RL.init = function () {
console.log("ReportList init start"); //Check if user is logged in
// COMMON.checkAuth(true); COMMON.checkAuth(false);
console.log('ReportList init start');
RL.loadCommon(); RL.loadCommon();
RL.initTaskReportList(); RL.initTaskReportList();
}; };
RL.loadCommon = function() { RL.loadCommon = function () {
$("#includedHeader").load("../html/common/header.html" , function() { $('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n(); I18N.initi18n();
HEADER.init(); HEADER.init();
}); });
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() { $('#includedConfirmModal').load('../html/common/confirmModal.html', function () {
I18N.initi18n(); I18N.initi18n();
}); });
} };
RL.initTaskReportList = function() { RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
let params = {}; let params = {};
params.sid = COMMON.getSid(); params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId; params.operationId = sessionStorage.OL_operationId;
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST; params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.TASK_REPORT_LIST;
$("#reportList").load(url, params); $('#reportList').load(url, params);
} else { } else {
COMMON.displayAlert("error"); COMMON.displayAlert('error');
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove('index.html');
} }
} };
RL.goPdfPrint = function() {
COMMON.avwScreenMove("pdfPrint.html");
}
RL.goPdfPrint = function () {
COMMON.avwScreenMove('pdfPrint.html');
};
abweb/js/sendMessage/send-message.js → abweb/js/sendMessage/sendMessage.js
/** /**
* Send Message js in send-message.html * Send Message js in sendMessage.html
* *
* @since 1.0 check web * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var SendMessage = {}; var SendMessage = {};
...@@ -12,31 +12,31 @@ SendMessage.contentMaxLength = 207; ...@@ -12,31 +12,31 @@ SendMessage.contentMaxLength = 207;
* Get input content * Get input content
* @returns string * @returns string
*/ */
SendMessage.getCurrentMessageContent = function() { SendMessage.getCurrentMessageContent = function () {
return $('#messageContent').val(); return $('#messageContent').val();
} };
/** /**
* Get operation id selected * Get operation id selected
* @returns string * @returns string
*/ */
SendMessage.getCurrentOperationId = function() { SendMessage.getCurrentOperationId = function () {
return $('#operationSelected').attr('data-operation-id'); return $('#operationSelected').attr('data-operation-id');
} };
/** /**
* Get send type selected * Get send type selected
* @returns string * @returns string
*/ */
SendMessage.getCurrentSendType = function() { SendMessage.getCurrentSendType = function () {
return $('input[name="sendType"]:checked').val(); return $('input[name="sendType"]:checked').val();
} };
/** /**
* Check data required when send message request to cms * Check data required when send message request to cms
* @returns boolean * @returns boolean
*/ */
SendMessage.checkValidation = function() { SendMessage.checkValidation = function () {
const message = SendMessage.getCurrentMessageContent(); const message = SendMessage.getCurrentMessageContent();
if (!ValidationUtil.CheckRequiredForText(message)) { if (!ValidationUtil.CheckRequiredForText(message)) {
alert(I18N.i18nText('msgContentRequired')); alert(I18N.i18nText('msgContentRequired'));
...@@ -62,7 +62,7 @@ SendMessage.checkValidation = function() { ...@@ -62,7 +62,7 @@ SendMessage.checkValidation = function() {
/** /**
* handle click event of send button * handle click event of send button
*/ */
SendMessage.onClickSend = function() { SendMessage.onClickSend = function () {
if (!SendMessage.checkValidation()) { if (!SendMessage.checkValidation()) {
return; return;
} }
...@@ -78,35 +78,40 @@ SendMessage.onClickSend = function() { ...@@ -78,35 +78,40 @@ SendMessage.onClickSend = function() {
* @param {long} operationId * @param {long} operationId
* @param {int} sendType - 0: Group, 1: All * @param {int} sendType - 0: Group, 1: All
*/ */
SendMessage.postMessage = function(message, operationId, sendType) { SendMessage.postMessage = function (message, operationId, sendType) {
let param = { let param = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
message: message, message: message,
operationId: operationId, operationId: operationId,
sendType: sendType sendType: sendType,
}; };
COMMON.cmsAjax(SendMessage.baseApiUrl, param, false, function (json) { COMMON.cmsAjax(
SendMessage.baseApiUrl,
}, function() { param,
false,
function (json) {},
function () {
console.log('SendMessage.postMessage error'); console.log('SendMessage.postMessage error');
},
}); );
}; };
SendMessage.operationSelectedCallback = function(operationId, operationName) { SendMessage.operationSelectedCallback = function (operationId, operationName) {
$('#operationSelected').attr('data-operation-id', operationId); $('#operationSelected').attr('data-operation-id', operationId);
$('#operationSelected').text(operationName); $('#operationSelected').text(operationName);
} };
SendMessage.templateSelectedCallback = function(template) { SendMessage.templateSelectedCallback = function (template) {
$('#messageContent').val(template); $('#messageContent').val(template);
} };
/** /**
* init data, action when screen onload * init data, action when screen onload
*/ */
SendMessage.init = function () { SendMessage.init = function () {
TEMPLATE.loadHearder("#includedHeader"); //Check if user is logged in
COMMON.checkAuth(false);
TEMPLATE.loadHearder('#includedHeader');
const navs = [ const navs = [
{ {
titleLang: 'dashboard', titleLang: 'dashboard',
...@@ -116,7 +121,7 @@ SendMessage.init = function () { ...@@ -116,7 +121,7 @@ SendMessage.init = function () {
titleLang: 'sendMessageTitle', titleLang: 'sendMessageTitle',
}, },
]; ];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "sendMessageTitle", navs, null); TEMPLATE.loadMainNavsTitle('#includedMainTitle', 'sendMessageTitle', navs, null);
TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback); TEMPLATE.loadOperationSelect('#includeOperationSelect', SendMessage.operationSelectedCallback);
TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback); TEMPLATE.loadNotificationSelect('#includeTemplateModal', SendMessage.templateSelectedCallback);
$('#messageContent').attr('maxlength', SendMessage.contentMaxLength); $('#messageContent').attr('maxlength', SendMessage.contentMaxLength);
......
abweb/js/setting/settings.js
/// Account Settings function js /**
* Account Settings function js
* @since cms:1.4.3.2&1.4.3.3 web:1.0
**/
var SETTINGS = {}; var SETTINGS = {};
// Init function of page // Init function of page
$(document).ready(function () { $(document).ready(function () {
//Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
SETTINGS.initScreen(); SETTINGS.initScreen();
$("#dspPwdUpd1").click(SETTINGS.dspPwdUpd1_Click); $('#dspPwdUpd1').click(SETTINGS.dspPwdUpd1_Click);
}); });
// Process changing password // Process changing password
SETTINGS.dspPwdUpd1_Click = function(e) { SETTINGS.dspPwdUpd1_Click = function (e) {
e.preventDefault(); e.preventDefault();
var isOK = true; var isOK = true;
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
...@@ -19,8 +23,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) { ...@@ -19,8 +23,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
isOK = false; isOK = false;
msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdCurr')).toString()); msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdCurr')).toString());
msgError.show(); msgError.show();
} } else {
else {
if (!ValidationUtil.CheckRequiredForText(SETTINGS.getNewPassword())) { if (!ValidationUtil.CheckRequiredForText(SETTINGS.getNewPassword())) {
isOK = false; isOK = false;
msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdNew')).toString()); msgError.html(COMMON.format(I18N.i18nText('msgEssential'), I18N.i18nText('txtPwdNew')).toString());
...@@ -38,7 +41,6 @@ SETTINGS.dspPwdUpd1_Click = function(e) { ...@@ -38,7 +41,6 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
} }
} }
if (isOK) { if (isOK) {
// Check min length // Check min length
if (!ValidationUtil.CheckMinLengthForByte(SETTINGS.getNewPassword(), 6)) { if (!ValidationUtil.CheckMinLengthForByte(SETTINGS.getNewPassword(), 6)) {
isOK = false; isOK = false;
...@@ -68,43 +70,38 @@ SETTINGS.dspPwdUpd1_Click = function(e) { ...@@ -68,43 +70,38 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
// Do changing password // Do changing password
if (isOK) { if (isOK) {
var params = { var params = {
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
loginId: ClientData.userInfo_loginId_session(), loginId: ClientData.userInfo_loginId_session(),
password: SETTINGS.getCurrentPassword(), password: SETTINGS.getCurrentPassword(),
newPassword: SETTINGS.getNewPassword(), newPassword: SETTINGS.getNewPassword(),
language: I18N.getCurrentLanguage(), language: I18N.getCurrentLanguage(),
appId: 4 appId: 4,
}; };
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.PASSWORD_CHANGE;
COMMON.cmsAjax(url, params, false, COMMON.cmsAjax(url, params, false, SETTINGS.avwCmsApi_passwordChange_success, SETTINGS.avwCmsApi_passwordChange_fail);
SETTINGS.avwCmsApi_passwordChange_success, } else {
SETTINGS.avwCmsApi_passwordChange_fail);
}
else {
//alert('error'); //alert('error');
} }
}; };
SETTINGS.avwCmsApi_passwordChange_success = function(data) { SETTINGS.avwCmsApi_passwordChange_success = function (data) {
// OK // OK
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
if (data.httpStatus != CONSTANT.HTTP_STATUS.OK) { if (data.httpStatus != CONSTANT.HTTP_STATUS.OK) {
msgError.html(I18N.i18nText('msgPwdChangeNG')); msgError.html(I18N.i18nText('msgPwdChangeNG'));
msgError.show(); msgError.show();
} } else {
else {
msgError.html(''); msgError.html('');
$("#txtPwdCur").val(""); $('#txtPwdCur').val('');
$("#txtPwdNew").val(""); $('#txtPwdNew').val('');
$("#txtPwdNewRe").val(""); $('#txtPwdNewRe').val('');
/* show messages */ /* show messages */
COMMON.displayAlert('msgPwdChangeOK'); COMMON.displayAlert('msgPwdChangeOK');
} }
}; };
SETTINGS.avwCmsApi_passwordChange_fail = function(xhr, b, c) { SETTINGS.avwCmsApi_passwordChange_fail = function (xhr, b, c) {
/* show error messages */ /* show error messages */
var msgError = $('#main-error-message'); var msgError = $('#main-error-message');
if (xhr.errorMessage && xhr.httpStatus != 0) { if (xhr.errorMessage && xhr.httpStatus != 0) {
...@@ -115,7 +112,6 @@ SETTINGS.avwCmsApi_passwordChange_fail = function(xhr, b, c) { ...@@ -115,7 +112,6 @@ SETTINGS.avwCmsApi_passwordChange_fail = function(xhr, b, c) {
msgError.show(); msgError.show();
}; };
/* /*
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Event groups [ end ] Event groups [ end ]
...@@ -123,33 +119,32 @@ Event groups [ end ] ...@@ -123,33 +119,32 @@ Event groups [ end ]
*/ */
// Get input current password // Get input current password
SETTINGS.getCurrentPassword = function() { SETTINGS.getCurrentPassword = function () {
return $("#txtPwdCur").val(); return $('#txtPwdCur').val();
}; };
// Get input new password // Get input new password
SETTINGS.getNewPassword = function() { SETTINGS.getNewPassword = function () {
return $("#txtPwdNew").val(); return $('#txtPwdNew').val();
}; };
// Get input new password // Get input new password
SETTINGS.getNewPasswordRe = function() { SETTINGS.getNewPasswordRe = function () {
return $("#txtPwdNewRe").val(); return $('#txtPwdNewRe').val();
}; };
// Initalize screen // Initalize screen
SETTINGS.initScreen = function() { SETTINGS.initScreen = function () {
$("#includedHeader").load("../html/common/header.html" , function() { $('#includedHeader').load('../html/common/header.html', function () {
I18N.initi18n(); I18N.initi18n();
HEADER.init(); HEADER.init();
}); });
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() { $('#includedConfirmModal').load('../html/common/confirmModal.html', function () {
I18N.initi18n(); I18N.initi18n();
}); });
// Login ID // Login ID
$("#txtLoginId").text(ClientData.userInfo_loginId_session()); $('#txtLoginId').text(ClientData.userInfo_loginId_session());
// Account Path // Account Path
$("#txtLoginAccPath").text(ClientData.userInfo_accountPath_session()); $('#txtLoginAccPath').text(ClientData.userInfo_accountPath_session());
// Recent login date // Recent login date
$("#txtLastLoginTime").text(ClientData.userInfo_lastLoginTime()); $('#txtLastLoginTime').text(ClientData.userInfo_lastLoginTime());
}; };
abweb/js/template/template.js
...@@ -5,55 +5,62 @@ ...@@ -5,55 +5,62 @@
var TEMPLATE = {}; var TEMPLATE = {};
/** template load header */ /** template load header */
TEMPLATE.loadHearder = function(elmentId) { TEMPLATE.loadHearder = function (elmentId) {
$(elmentId).load("../html/common/header.html" , function() { $(elmentId).load('../html/common/header.html', function () {
$('#iconHomeDashboard').removeClass('active');
$('#iconHomeWorkList').removeClass('active');
if (sessionStorage.activeHomePage == CONSTANT.PAGE_NAME.OPERATION_LIST) {
$('#iconHomeWorkList').addClass('active');
} else {
$('#iconHomeDashboard').addClass('active');
}
I18N.initi18n(); I18N.initi18n();
}); });
} };
/** /**
* template load dashboard setting * template load dashboard setting
* @param {string} elmentId - element to load setting html * @param {string} elmentId - element to load setting html
* @param {*} changeCallback - callback when setting changed * @param {*} changeCallback - callback when setting changed
*/ */
TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) { TEMPLATE.loadDashboardSetting = function (elmentId, changeCallback) {
$(elmentId).load("dashboard-setting.html", function() { $(elmentId).load('dashboardSetting.html', function () {
DashboardSetting.init(changeCallback); DashboardSetting.init(changeCallback);
I18N.initi18n(); I18N.initi18n();
}); });
} };
/** Template load confirm model */ /** Template load confirm model */
TEMPLATE.loadConfirmModal = function(elmentId) { TEMPLATE.loadConfirmModal = function (elmentId) {
$(elmentId).load("../html/common/confirm-modal.html", function() { $(elmentId).load('../html/common/confirmModal.html', function () {
I18N.initi18n(); I18N.initi18n();
}); });
} };
/** Template load operation select */ /** Template load operation select */
TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) { TEMPLATE.loadOperationSelect = function (elmentId, selectCallback) {
$(elmentId).load("operation-select.html", function() { $(elmentId).load('operationSelect.html', function () {
OperationSelect.init(selectCallback); OperationSelect.init(selectCallback);
I18N.initi18n(); I18N.initi18n();
}); });
} };
/** /**
* show confirm model * show confirm model
*/ */
TEMPLATE.showModalConfirm = function () { TEMPLATE.showModalConfirm = function () {
$("#showConfirm").click(function(){ $('#showConfirm').click(function () {
$("#confirm-modal").modal(); $('#confirm-modal').modal();
}); });
}; };
/** Template load notification content*/ /** Template load notification content*/
TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) { TEMPLATE.loadNotificationSelect = function (elmentId, selectCallback) {
$(elmentId).load("notification-content.html", function() { $(elmentId).load('notificationContent.html', function () {
NotificationSelect.init(selectCallback); NotificationSelect.init(selectCallback);
I18N.initi18n(); I18N.initi18n();
}); });
} };
/** /**
* load main navs title html to a element by id * load main navs title html to a element by id
...@@ -61,15 +68,15 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) { ...@@ -61,15 +68,15 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
* @param {string} titleLang - lang of title * @param {string} titleLang - lang of title
* @param {Array} navs - array nav items (titleLang, href) * @param {Array} navs - array nav items (titleLang, href)
*/ */
TEMPLATE.loadMainNavsTitle = function(elmentId, titleLang, navs, completeCallback) { TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, navs, completeCallback) {
var titleHtmlPath = '../common/main-title.html'; var titleHtmlPath = '../common/html/mainTitle.html';
if (navs) { if (navs) {
titleHtmlPath = '../common/main-nav-title.html'; titleHtmlPath = '../common/html/mainNavTitle.html';
} }
$(elmentId).load(titleHtmlPath , function(data) { $(elmentId).load(titleHtmlPath, function (data) {
$(elmentId).replaceWith(data); $(elmentId).replaceWith(data);
if (titleLang) { if (titleLang) {
$('#mainTitleHeader').attr("lang", titleLang); $('#mainTitleHeader').attr('lang', titleLang);
} }
if (navs) { if (navs) {
var olElm = $('#mainTitleNavs ol'); var olElm = $('#mainTitleNavs ol');
...@@ -99,4 +106,4 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) { ...@@ -99,4 +106,4 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
completeCallback(); completeCallback();
} }
}); });
} };
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