Skip to content

C
check
Commit 2954515b 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 !83
parents 60bf6315 15b472cb
Showing with 54 additions and 78 deletions
abweb/common/json/lang/lang-en.json
...@@ -121,5 +121,6 @@ ...@@ -121,5 +121,6 @@
"msgSendPushMessageConfirm": "Do you want to send message?", "msgSendPushMessageConfirm": "Do you want to send message?",
"close":"Close", "close":"Close",
"dateError": "Set the start date before the end date.", "dateError": "Set the start date before the end date.",
"onlyRfid":"RFID or barcode is set.\nPlease scan the code." "onlyRfid":"RFID or barcode is set.\nPlease scan the code.",
"errorOccured": "Communication error."
} }
\ No newline at end of file
abweb/common/json/lang/lang-ja.json
...@@ -119,5 +119,6 @@ ...@@ -119,5 +119,6 @@
"msgSendPushMessageConfirm": "プッシュメッセージを送信しますか?", "msgSendPushMessageConfirm": "プッシュメッセージを送信しますか?",
"close":"閉じる", "close":"閉じる",
"dateError": "開始日は終了日の前に設定してください。", "dateError": "開始日は終了日の前に設定してください。",
"onlyRfid":"RFID又はバーコードが設定されています。\n該当コードを読み込んでください。" "onlyRfid":"RFID又はバーコードが設定されています。\n該当コードを読み込んでください。",
"errorOccured": "通信エラーです。"
} }
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
...@@ -118,5 +118,6 @@ ...@@ -118,5 +118,6 @@
"msgSendPushMessageConfirm": "Do you want to send message?", "msgSendPushMessageConfirm": "Do you want to send message?",
"close":"Close", "close":"Close",
"dateError": "시작일은 종료일 이전에 설정하십시오.", "dateError": "시작일은 종료일 이전에 설정하십시오.",
"onlyRfid":"RFID또는 바코드가 설정되어있습니다.\n해당코드를 스캔해주십시오." "onlyRfid":"RFID또는 바코드가 설정되어있습니다.\n해당코드를 스캔해주십시오.",
"errorOccured": "통신 오류입니다."
} }
\ No newline at end of file
abweb/js/pickup/pickup.js
...@@ -136,7 +136,8 @@ PICKUP.init = function () { ...@@ -136,7 +136,8 @@ PICKUP.init = function () {
COMMON.showLoading(); COMMON.showLoading();
COMMON.checkAuth(false); COMMON.checkAuth(false);
console.log('PICKUP.init'); console.log('PICKUP.init');
sessionStorage.removeItem("pickUpType");
sessionStorage.removeItem('pickUpType');
sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD; sessionStorage.activeHomePage = CONSTANT.PAGE_TAB.DASHBOARD;
TEMPLATE.loadHeader('#includedHeader'); TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal'); TEMPLATE.loadConfirmModal('#includedConfirmModal');
...@@ -155,7 +156,6 @@ PICKUP.init = function () { ...@@ -155,7 +156,6 @@ PICKUP.init = function () {
COMMON.closeLoading(); COMMON.closeLoading();
}; };
/** /**
* Setting pickup data * Setting pickup data
*/ */
...@@ -750,7 +750,8 @@ PICKUP.getInspectDate = function (dateString) { ...@@ -750,7 +750,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
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.NEW_REPORT); sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.NEW_REPORT);
sessionStorage.setItem('operationId', operationId);
const url = 'reportForm.html?operationId=' + operationId; const url = 'reportForm.html?operationId=' + operationId;
COMMON.avwScreenMove(url); COMMON.avwScreenMove(url);
}; };
...@@ -764,7 +765,8 @@ PICKUP.sendReportFormFromNewReport = function (operationId) { ...@@ -764,7 +765,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
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK); sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK);
sessionStorage.setItem('operationId', operationId);
const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo; const url = 'reportForm.html?operationId=' + operationId + '&processKey=' + processKey + '&phaseNo=' + phaseNo;
COMMON.avwScreenMove(url); COMMON.avwScreenMove(url);
}; };
...@@ -780,7 +782,8 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces ...@@ -780,7 +782,8 @@ 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
sessionStorage.setItem("pickUpType", CONSTANT.PICK_UP_TYPE.WARNING_REPORT); sessionStorage.setItem('pickUpType', CONSTANT.PICK_UP_TYPE.WARNING_REPORT);
sessionStorage.setItem('operationId', operationId);
let url = 'reportForm.html?operationId=' + operationId; let url = 'reportForm.html?operationId=' + operationId;
switch (reportType) { switch (reportType) {
case PICKUP.REPORT_TYPE.REPORTONLY: case PICKUP.REPORT_TYPE.REPORTONLY:
......
abweb/js/reportForm/reportForm.js
...@@ -36,81 +36,42 @@ RF.loadCommon = function () { ...@@ -36,81 +36,42 @@ RF.loadCommon = function () {
* create breadcrumb menu on ReportForm * create breadcrumb menu on ReportForm
*/ */
RF.initBreadcrumb = function () { RF.initBreadcrumb = function () {
let navs = [];
const reportFormBread = { titleLang: CONSTANT.PAGE_NAME.REPORT_FORM };
const reportListBread = {
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
};
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) { if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) { const dashBordBread = {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.DASHBOARD, titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD, href: CONSTANT.URL_TREE_NAME.DASHBOARD,
}, };
{ let pickupBread = { titleLang: CONSTANT.PAGE_NAME.PICKUP };
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_CONTINUOS, if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.CONTINOUS_WORK) {
}, pickupBread.href = CONSTANT.URL_TREE_NAME.PICKUP_CONTINUOS;
{ navs = [dashBordBread, pickupBread, reportFormBread];
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
];
} else if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) { } else if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.WARNING_REPORT) {
navs = [ pickupBread.href = CONSTANT.URL_TREE_NAME.PICKUP_WARNING;
{ navs = [dashBordBread, pickupBread, reportFormBread];
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_WARNING,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
];
} else { } else {
navs = [ pickupBread.href = CONSTANT.URL_TREE_NAME.PICKUP_NEW;
{ navs = [dashBordBread, pickupBread, reportListBread, reportFormBread];
titleLang: CONSTANT.PAGE_NAME.DASHBOARD,
href: CONSTANT.URL_TREE_NAME.DASHBOARD,
},
{
titleLang: CONSTANT.PAGE_NAME.PICKUP,
href: CONSTANT.URL_TREE_NAME.PICKUP_NEW,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
];
} }
} else { } else {
if (sessionStorage.getItem('pickUpType')) sessionStorage.removeItem('pickUpType'); if (sessionStorage.getItem('pickUpType')) sessionStorage.removeItem('pickUpType');
const operationListBread = {
if (RF.addReportFlg && RF.addReportFlg == 1) {
navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST, titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST, href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
}, };
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST, const reportType = sessionStorage.getItem('reportType');
href: CONSTANT.URL_TREE_NAME.REPORT_LIST, if ((RF.addReportFlg && RF.addReportFlg == 1) || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
}, navs = [operationListBread, reportListBread, reportFormBread];
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
];
} else { } else {
navs = [ navs = [operationListBread, reportFormBread];
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_FORM,
},
];
} }
} }
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, RF.loadMainTitleCallback); TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.REPORT_FORM, navs, RF.loadMainTitleCallback);
...@@ -120,11 +81,16 @@ RF.initBreadcrumb = function () { ...@@ -120,11 +81,16 @@ RF.initBreadcrumb = function () {
* load main title callcack * load main title callcack
*/ */
RF.loadMainTitleCallback = function () { RF.loadMainTitleCallback = function () {
//add dashboard setting item const elmInspect = $(
var elmA = $('<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">'); '<div id ="inspectLabelWeb" style="display: none; margin:0 auto">' +
let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">'); '<div><span class=" lang" style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>' +
'<div><span id="inspectDate"></span></div></div>',
);
let elmA = $('<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">');
const elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">');
elmA.append(elmImg); elmA.append(elmImg);
$('#mainTitleHeader').after(elmA); $('#mainTitleHeader').after(elmA);
$('#mainTitleHeader').after(elmInspect);
}; };
/** /**
...@@ -166,13 +132,14 @@ RF.initFormView = function () { ...@@ -166,13 +132,14 @@ RF.initFormView = function () {
*/ */
RF.backPage = function () { RF.backPage = function () {
if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) { if (sessionStorage.activeHomePage == CONSTANT.PAGE_TAB.DASHBOARD) {
if (addReportFlg == 1) { if (sessionStorage.getItem('pickUpType') == CONSTANT.PICK_UP_TYPE.NEW_REPORT) {
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove('reportList.html');
} else { } else {
COMMON.avwScreenMove('pickup.html'); COMMON.avwScreenMove('pickup.html');
} }
} else { } else {
if (addReportFlg == 1) { const reportType = sessionStorage.getItem('reportType');
if (addReportFlg == 1 || reportType == CONSTANT.REPORT_TYPE_INT.ROUTINE) {
COMMON.avwScreenMove('reportList.html'); COMMON.avwScreenMove('reportList.html');
} else { } else {
COMMON.avwScreenMove('index.html'); COMMON.avwScreenMove('index.html');
......
abweb/js/template/template.js
...@@ -125,9 +125,9 @@ TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, navs, completeCallba ...@@ -125,9 +125,9 @@ TEMPLATE.loadMainNavsTitle = function (elmentId, titleLang, navs, completeCallba
olElm.append(liElm); olElm.append(liElm);
} }
} }
I18N.initi18n();
if (completeCallback) { if (completeCallback) {
completeCallback(); completeCallback();
} }
I18N.initi18n();
}); });
}; };
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