Skip to content

C
check
Commit 07e249ac by Kang Donghun
Options

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

Feature/1.0 check web dev imai

See merge request !49
parents a1be92e9 13d64db1
Showing with 117 additions and 69 deletions
abweb/common/js/common.js
...@@ -189,32 +189,6 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty ...@@ -189,32 +189,6 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
}; };
/** /**
* Communicate with cms and post
*
* @param {String} url
* @param {Object} params
* @param {String} method
*/
COMMON.postCommunication = function (url, params, method = 'post') {
const form = document.createElement('form');
form.method = method;
form.action = url;
for (const key in params) {
if (params.hasOwnProperty(key)) {
const hiddenField = document.createElement('input');
hiddenField.type = 'hidden';
hiddenField.name = key;
hiddenField.value = params[key];
form.appendChild(hiddenField);
}
}
document.body.appendChild(form);
form.submit();
};
/**
* Check if user is logged in * Check if user is logged in
* *
* @param {boolean} async * @param {boolean} async
......
abweb/common/js/constant.js
...@@ -23,6 +23,25 @@ CONSTANT.PAGE_NAME = { ...@@ -23,6 +23,25 @@ CONSTANT.PAGE_NAME = {
LOGIN: './login.html', LOGIN: './login.html',
}; };
CONSTANT.URL_TREE_NAME = {
OPERATION_LIST: 'index.html',
DASHBOARD: 'dashboard.html',
REPORT_FORM: 'reportForm.html',
REPORT_LIST: 'reportList.html',
MESSAGE_DETAIL: 'pushMessageDetail.html',
MESSAGE_LIST: 'pushMessageList.html',
SEND_MESSAGE: 'sendMessage.html',
SETTING: 'accountSetting.html',
PICKUP: 'pickup.html',
};
CONSTANT.URL_TREE_PASS = {
1: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
2: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.PICKUP, CONSTANT.URL_TREE_NAME.REPORT_FORM],
3: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.MESSAGE_LIST, CONSTANT.URL_TREE_NAME.MESSAGE_DETAIL],
4: [CONSTANT.URL_TREE_NAME.DASHBOARD, CONSTANT.URL_TREE_NAME.SEND_MESSAGE],
};
CONSTANT.PAGE_TAB = { CONSTANT.PAGE_TAB = {
DASHBOARD: 'dashboard', DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList', OPERATION_LIST: 'operationList',
...@@ -35,6 +54,13 @@ CONSTANT.REPORT_TYPE = { ...@@ -35,6 +54,13 @@ CONSTANT.REPORT_TYPE = {
WORKFLOW: '3', WORKFLOW: '3',
}; };
CONSTANT.REPORT_TYPE_INT = {
REPORT: 0,
ROUTINE: 1,
ANSWER: 2,
WORKFLOW: 3,
};
CONSTANT.ADD_REPORT_FLG = { CONSTANT.ADD_REPORT_FLG = {
UNABLE: '0', UNABLE: '0',
ABLE: '1', ABLE: '1',
......
abweb/html/accountSetting.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/constant.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="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/validation.js"></script> <script type="text/javascript" src="../common/js/validation.js"></script>
<script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/setting/settings.js?__UPDATEID__"></script>
......
abweb/html/dashboard.html
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.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>
<script type="text/javascript" src="../js/header/header.js"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.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>
......
abweb/html/index.html
...@@ -133,14 +133,14 @@ ...@@ -133,14 +133,14 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<!--アラート--> <!--alert-->
<div class="alert-overlay d-none"></div> <div class="alert-overlay d-none"></div>
<div class="alert-area d-none"> <div class="alert-area d-none">
<i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i> <i class="text-right fas fa-times fa-2x loading-close" onclick="COMMON.alertClose();"></i>
<div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div> <div class="fs-13 mt-4 text-left" style="padding: 15px;" id="alertMsg"></div>
</div> </div>
<!--ローディング--> <!--loading-->
<div id="check_loading" style="display:none; position: relative; overflow:hidden;"> <div id="check_loading" style="display:none; position: relative; overflow:hidden;">
<p id="checkLoadingMessage"></p> <p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='######' /></div> <div id="checkLoadingImage"><img src='######' /></div>
......
abweb/html/pdfPrint.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
......
abweb/html/pickup.html
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<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/dashboardSetting.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 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 src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.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>
......
abweb/html/pushMessageDetail.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../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>
<script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script> <script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script>
......
abweb/html/reportForm.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/constant.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="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></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>
<script src="../js/reportForm/reportForm.js?__UPDATEID__"></script> <script src="../js/reportForm/reportForm.js?__UPDATEID__"></script>
......
abweb/html/reportList.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/constant.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="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script src="../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>
<script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/reportList/reportList.js?__UPDATEID__"></script>
......
abweb/js/dashboard/dashboard.js
...@@ -15,8 +15,6 @@ DASHBOARD.pickupItems = [ ...@@ -15,8 +15,6 @@ DASHBOARD.pickupItems = [
DASHBOARD.communicationItems = [ DASHBOARD.communicationItems = [
{ id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'messageListTitle' }, { id: 'messageList', href: 'javascript:DASHBOARD.goMessageList();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_message_list.svg' }, msg: 'messageListTitle' },
{ id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessageTitle' }, { id: 'sendMessage', href: 'javascript:DASHBOARD.goSendMessage();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_send_message.svg' }, msg: 'sendMessageTitle' },
{ id: 'distanceSupport', href: 'javascript:DASHBOARD.goDistanceSupport();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_remote.svg' }, msg: 'distanceSupportTitle' },
{ id: 'chat', href: 'javascript:DASHBOARD.goChat();', count: 0, enabled: true, img: { src: '../common/img/dahboard_icon_chat.svg' }, msg: 'chatTitle' },
]; ];
/** Default dashboard setting data */ /** Default dashboard setting data */
......
abweb/js/header/header.js
...@@ -17,6 +17,69 @@ HEADER.init = function () { ...@@ -17,6 +17,69 @@ HEADER.init = function () {
}; };
/** /**
* create url tree & show breadcrumbs list
*/
HEADER.urlTree = function () {
const pathName = location.pathname;
const htmlName = pathName.substring(pathName.indexOf('/') + 1);
//now url tree
let urlTree = session.getItem('urlTree');
// check auth
let authFlg = false;
if ((!urlTree && htmlName == CONSTANT.URL_TREE_NAME.OPERATION_LIST) || htmlName == CONSTANT.URL_TREE_NAME.DASHBOARD) {
authFlg = true;
session.removeItem('urlTree');
}
urlList: for (const i in urlTree) {
const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
findUrl: for (const passList in CONSTANT.URL_TREE_PASS) {
for (const k in passList) {
if (urlHtmlName == passList[k]) {
if (htmlName == passList[k]) {
authFlg = true;
break urlList;
}
break;
} else {
break findUrl;
}
}
}
}
if (authFlg) {
session.removeItem('urlTree');
let newUrlTree = {};
const urlPath = htmlName + location.search;
for (const i in urlTree) {
const urlHtmlName = urlTree[i].substring(0, pathName.indexOf('?'));
if (urlHtmlName == htmlName) {
newUrlTree.push(urlPath);
} else {
newUrlTree.push(urlTree[i]);
}
}
session.setItem('urlTree', newUrlTree);
//show urlTree
if ($('.breadcrumb').length) {
for (const i in newUrlTree) {
const urlHtmlName = newUrlTree[i].substring(0, pathName.indexOf('?'));
if (urlHtmlName == htmlName) {
$('.breadcrumb').append('<li class="breadcrumb-item">作業一覧</li>');
} else {
$('.breadcrumb').append('<li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>');
}
}
}
} else {
COMMON.avwScreenMove('index.html');
}
};
/**
* Direct home page setting * Direct home page setting
* @param {*} pageId * @param {*} pageId
*/ */
...@@ -82,17 +145,15 @@ HEADER.processLogout = function () { ...@@ -82,17 +145,15 @@ HEADER.processLogout = function () {
* Go page of operationList * Go page of operationList
*/ */
HEADER.goOperationList = function () { HEADER.goOperationList = function () {
$('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () { sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST; OL.init();
HEADER.activeInitBottomNav('operationListBottomNav');
TOP.showPage(CONSTANT.PAGE_NAME.OPERATION_LIST);
});
}; };
/** /**
* 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/js/operationList/operationList.js
...@@ -148,16 +148,16 @@ OL.createOperationList = function (operationList) { ...@@ -148,16 +148,16 @@ OL.createOperationList = function (operationList) {
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
let classIcon; let classIcon;
switch (operationList[i].reportType) { switch (operationList[i].reportType) {
case OL.REPORT_TYPE.REPORTONLY: case CONSTANT.REPORT_TYPE_INT.REPORT:
classIcon = 'report'; classIcon = 'report';
break; break;
case OL.REPORT_TYPE.INSPECT: case CONSTANT.REPORT_TYPE_INT.ROUTINE:
classIcon = 'inspection'; classIcon = 'inspection';
break; break;
case OL.REPORT_TYPE.WITHREPLY: case CONSTANT.REPORT_TYPE_INT.ANSWER:
classIcon = 'questionary'; classIcon = 'questionary';
break; break;
case OL.REPORT_TYPE.WORKFLOW: case CONSTANT.REPORT_TYPE_INT.WORKFLOW:
classIcon = 'proccess'; classIcon = 'proccess';
break; break;
} }
......
abweb/js/pickup/pickup.js
...@@ -747,11 +747,8 @@ PICKUP.getInspectDate = function (dateString) { ...@@ -747,11 +747,8 @@ PICKUP.getInspectDate = function (dateString) {
*/ */
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 = {}; const url = 'reportForm.html?operationId=' + operationId;
params.sid = COMMON.getSid(); COMMON.avwScreenMove(url);
params.operationId = operationId;
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);
}; };
/** /**
...@@ -763,13 +760,8 @@ PICKUP.sendReportFormFromNewReport = function (operationId) { ...@@ -763,13 +760,8 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
*/ */
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 = {}; const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo;
params.sid = COMMON.getSid(); COMMON.avwScreenMove(url);
params.operationId = operationId;
params.processKey = processKey;
params.phaseNo = phaseNo;
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);
}; };
/** /**
...@@ -783,25 +775,23 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces ...@@ -783,25 +775,23 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
*/ */
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 url = 'reportForm.html?operationId=' + operationId;
params.sid = COMMON.getSid();
params.operationId = operationId;
switch (reportType) { switch (reportType) {
case PICKUP.REPORT_TYPE.REPORTONLY: case PICKUP.REPORT_TYPE.REPORTONLY:
params.taskKey = taskKey; url += '&taskKey' + taskKey;
break; break;
case PICKUP.REPORT_TYPE.INSPECT: case PICKUP.REPORT_TYPE.INSPECT:
params.taskKey = taskKey; url += '&taskKey' + taskKey;
break; break;
case PICKUP.REPORT_TYPE.WITHREPLY: case PICKUP.REPORT_TYPE.WITHREPLY:
params.replyNo = replyNo; url += '&taskKey' + taskKey;
url += '&replyNO' + replyNo;
break; break;
case PICKUP.REPORT_TYPE.WORKFLOW: case PICKUP.REPORT_TYPE.WORKFLOW:
params.processKey = processKey; url += '&processKey' + processKey;
params.phaseNo = phaseNo; url += '&phaseNo' + phaseNo;
break; break;
} }
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM; COMMON.avwScreenMove(url);
COMMON.postCommunication(url, params);
}; };
abweb/js/reportForm/reportForm.js
...@@ -15,7 +15,6 @@ RF.init = function () { ...@@ -15,7 +15,6 @@ RF.init = function () {
RF.loadCommon(); RF.loadCommon();
RF.initFormView(); RF.initFormView();
COMMON.closeLoading();
}; };
/** /**
...@@ -55,6 +54,7 @@ RF.initFormView = function () { ...@@ -55,6 +54,7 @@ RF.initFormView = function () {
const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM; const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
$('#report-form').load(url, params, function () { $('#report-form').load(url, params, function () {
initPageLoad(); initPageLoad();
COMMON.closeLoading();
}); });
} else { } else {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment