Skip to content

C
check
Commit 8e635fbc by Takumi Imai
Options

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

parents 4bbf9651 deb21e90
Showing with 77 additions and 58 deletions
abweb/common/css/newdash/app.css
......@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{
}
.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-repeat: no-repeat;
width: 14px;
......@@ -20590,7 +20590,7 @@ button {
list-style: none;
}
.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;
width: 17px;
height: 17px;
......@@ -20689,7 +20689,7 @@ button {
.type-icon .report:before{
content: '';
background-image: url("../img/type_icon_report.svg");
background-image: url("/abweb/common/img/type_icon_report.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......@@ -20699,7 +20699,7 @@ button {
}
.type-icon .questionary:before{
content: '';
background-image: url("../img/type_icon_questionary.svg");
background-image: url("/abweb/common/img/type_icon_questionary.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......@@ -20709,7 +20709,7 @@ button {
}
.type-icon .inspection:before{
content: '';
background-image: url("../img/type_icon_inspection.svg");
background-image: url("/abweb/common/img/type_icon_inspection.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......@@ -20719,7 +20719,7 @@ button {
}
.type-icon .proccess:before{
content: '';
background-image: url("../img/type_icon_proccess.svg");
background-image: url("/abweb/common/img/type_icon_proccess.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......
abweb/common/js/constant.js
......@@ -19,7 +19,7 @@ CONSTANT.SORT_TYPE = {
CONSTANT.PAGE_NAME = {
DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList',
FOOTER: 'main-footer.html',
FOOTER: 'mainFooter.html',
DEFAULT: 'index.html',
LOGIN: './login.html',
};
......
abweb/common/js/header.js
......@@ -12,20 +12,23 @@
DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1)
{
HEADER.goDashboard();
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
HEADER.goDashboard();
}
else
{
HEADER.goOperationList();
}
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.goOperationList();
}
});
}
/**
* Go page of operationList
*/
HEADER.goOperationList = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.OPERATION_LIST;
$('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () {
sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.activeInitBottomNav('operationListBottomNav');
......@@ -37,6 +40,7 @@
* Go page of dashboard
*/
HEADER.goDashboard = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_NAME.DASHBOARD;
COMMON.avwScreenMove("dashboard.html");
};
......
abweb/html/common/header.html
......@@ -5,13 +5,13 @@
<img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
</a>
<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">
<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>
</a>
</li>
<li class="nav-link">
<li class="nav-link" id="iconHomeWorkList">
<a href="task-list.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">
<div class="fs-7 d-sm-block d-none lang" lang="workList"></div>
......@@ -25,11 +25,11 @@
</a>
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<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">
<span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
</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">
<span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
</a>
......
abweb/html/dashboard.html
......@@ -23,7 +23,7 @@
<script src="../common/js/common.js?__UPDATEID__"></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/dashboard/dashboard.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 @@
</head>
<body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- dashboard -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup"></h2>
......
abweb/html/index.html
......@@ -21,7 +21,7 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.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="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script>
......@@ -164,7 +164,7 @@
<div></div>
<h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang alignCenter_header" data-msg="dashboardHeaderTitle"></h1>
<div class="d-flex align-items-center">
<a href="javascript:CHK.goUrlWithCurrentParams('dashboard-setting.html');" class="nav-link text-white lht-0 p-1 mr-2">
<a href="javascript:CHK.goUrlWithCurrentParams('dashboardSetting.html');" class="nav-link text-white lht-0 p-1 mr-2">
<img class="icon" src="../img/dashboard/icon_dashboard_setting.svg" alt="">
<span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonDashboardSetting"></span>
</a>
......
abweb/html/pickup.html
......@@ -26,7 +26,7 @@
<!-- main js -->
<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 src="/abweb/common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script>
......@@ -44,13 +44,13 @@
</head>
<body >
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- pickup -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- tab -->
<ul class="nav nav-tabs line" id="myTab" role="tablist">
<li class="nav-item" id="liTabNewReport">
......
abweb/html/push-message-detail.html → abweb/html/pushMessageDetail.html
......@@ -26,7 +26,7 @@
<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/pushMessageDetail/push-message-detail.js"></script>
<script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script>
<script type="text/javascript">
$(document).ready(function(){
......
abweb/html/push-message-list.html → abweb/html/pushMessageList.html
......@@ -26,7 +26,7 @@
<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/pushMessageList/push-message-list.js"></script>
<script type="text/javascript" src="../js/pushMessageList/pushMessageList.js"></script>
<script type="text/javascript">
$(document).ready(function(){
......@@ -37,12 +37,13 @@
<body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- message list -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- message -->
<ul class="card-list message-list p-0" id="messageList">
<li class="card mb-2 not-found d-none">
......
abweb/html/send-message.html → abweb/html/sendMessage.html
......@@ -25,10 +25,10 @@
<script src="../common/js/constant.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/notification-content/notification-content.js"></script>
<script type="text/javascript" src="../js/operationSelect/operationSelect.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/sendMessage/send-message.js"></script>
<script type="text/javascript" src="../js/sendMessage/sendMessage.js"></script>
<script type="text/javascript">
$(document).ready(function(){
......@@ -39,12 +39,13 @@
<body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- send message -->
<main>
<div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- content -->
<div class="py-2">
<div class="row">
......
abweb/js/dashboard/dashboard.js
......@@ -121,6 +121,7 @@ DASHBOARD.initHtmlItem = function (item) {
/** Initialization dashboard screen */
DASHBOARD.init = function () {
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
DASHBOARD.loadCommon();
DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) {
......@@ -173,14 +174,14 @@ DASHBOARD.goPickup = function (pickupId) {
/** Direct to Message list screen */
DASHBOARD.goMessageList = function () {
COMMON.goUrlWithCurrentParams('push-message-list.html', {});
COMMON.goUrlWithCurrentParams('pushMessageList.html', {});
};
/**
* Direct to send message screen
*/
DASHBOARD.goSendMessage = function () {
COMMON.goUrlWithCurrentParams('send-message.html', {});
COMMON.goUrlWithCurrentParams('sendMessage.html', {});
};
/**
......
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
*/
......
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
*/
......
abweb/js/pdfPrint/pdfPrint.js
......@@ -14,7 +14,7 @@ PP.loadCommon = function() {
I18N.initi18n();
HEADER.init();
});
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() {
$("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
I18N.initi18n();
});
}
......
abweb/js/pickup/pickup.js
......@@ -114,6 +114,7 @@ PICKUP.getReportWithWarningsListData = function (callback) {
*/
PICKUP.init = function() {
console.log("PICKUP.init");
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
TEMPLATE.loadHearder("#includedHeader");
TEMPLATE.loadConfirmModal("#includedConfirmModal");
const navs = [
......@@ -685,7 +686,7 @@ PICKUP.getInspectDate = function(dateString) {
let params = {};
params.sid = COMMON.getSid();
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);
}
......@@ -700,7 +701,7 @@ PICKUP.sendReportFormFromContinuousWork = function(operationId, taskKey, process
params.operationId = operationId;
params.processKey = processKey;
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);
}
......@@ -728,6 +729,7 @@ PICKUP.sendReportFormFromContinuousWork = function(operationId, taskKey, process
params.phaseNo = phaseNo;
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);
}
abweb/js/pushMessageDetail/push-message-detail.js → abweb/js/pushMessageDetail/pushMessageDetail.js
......@@ -26,7 +26,7 @@ PushMessageDetail.init = function() {
},
{
titleLang: 'messageListTitle',
href: 'push-message-list.html',
href: 'pushMessageList.html',
},
{
titleLang: 'messageDetail',
......
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
*/
var PushMessageList = {};
......@@ -48,7 +48,7 @@ PushMessageList.getMessageList = function (callback) {
* @param {string} pushMessageId
*/
PushMessageList.clickMessage = function(pushMessageId) {
COMMON.goUrlWithCurrentParams('push-message-detail.html', {pushMessageId: pushMessageId});
COMMON.goUrlWithCurrentParams('pushMessageDetail.html', {pushMessageId: pushMessageId});
}
/**
......
abweb/js/reportList/reportList.js
......@@ -15,7 +15,7 @@ RL.loadCommon = function() {
I18N.initi18n();
HEADER.init();
});
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() {
$("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
I18N.initi18n();
});
}
......
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
*/
......
abweb/js/setting/settings.js
......@@ -141,7 +141,7 @@ SETTINGS.initScreen = function() {
I18N.initi18n();
HEADER.init();
});
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() {
$("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
I18N.initi18n();
});
// Login ID
......
abweb/js/template/template.js
......@@ -7,6 +7,16 @@ var TEMPLATE = {};
/** template load header */
TEMPLATE.loadHearder = function(elmentId) {
$(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();
});
}
......@@ -17,7 +27,7 @@ TEMPLATE.loadHearder = function(elmentId) {
* @param {*} changeCallback - callback when setting changed
*/
TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) {
$(elmentId).load("dashboard-setting.html", function() {
$(elmentId).load("dashboardSetting.html", function() {
DashboardSetting.init(changeCallback);
I18N.initi18n();
});
......@@ -25,14 +35,14 @@ TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) {
/** Template load confirm model */
TEMPLATE.loadConfirmModal = function(elmentId) {
$(elmentId).load("../html/common/confirm-modal.html", function() {
$(elmentId).load("../html/common/confirmModal.html", function() {
I18N.initi18n();
});
}
/** Template load operation select */
TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) {
$(elmentId).load("operation-select.html", function() {
$(elmentId).load("operationSelect.html", function() {
OperationSelect.init(selectCallback);
I18N.initi18n();
});
......@@ -49,7 +59,7 @@ TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) {
/** Template load notification content*/
TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
$(elmentId).load("notification-content.html", function() {
$(elmentId).load("notificationContent.html", function() {
NotificationSelect.init(selectCallback);
I18N.initi18n();
});
......@@ -62,9 +72,9 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
* @param {Array} navs - array nav items (titleLang, href)
*/
TEMPLATE.loadMainNavsTitle = function(elmentId, titleLang, navs, completeCallback) {
var titleHtmlPath = '../common/main-title.html';
var titleHtmlPath = '../common/mainTitle.html';
if (navs) {
titleHtmlPath = '../common/main-nav-title.html';
titleHtmlPath = '../common/mainNavTitle.html';
}
$(elmentId).load(titleHtmlPath , function(data) {
$(elmentId).replaceWith(data);
......
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