Skip to content

C
check
Commit c41b039d by Takumi Imai
Options

Merge branch 'feature/1.0.1_check_web_dev_kdh' into 'feature/1.0.1_check_web_dev' 

Feature/1.0.1 check web dev kdh

See merge request !132
parents 1304419c e96624d9
Showing with 153 additions and 14 deletions
abweb/common/css/app.css
......@@ -20850,3 +20850,23 @@ button {
margin-left: -2px
}
}
.icon-xxs {
width: 20px;
height: 20px;
}
.icon-xs {
width: 24px;
height: 24px;
}
.icon-sm {
width: 32px;
height: 32px;
}
.icon-md {
width: 48px;
height: 48px;
}
.icon-lg {
width: 64px;
height: 64px;
}
abweb/common/js/constant.js
/**
* constant js
*
* @since 1.4.3.2 & 1.4.3.3
* @since 1.4.3.2 & 1.4.3.3 & 1.4.3.4
*/
const CONSTANT = {};
......@@ -27,6 +27,7 @@ CONSTANT.PAGE_NAME = {
SETTING: 'accountSetting',
PICKUP: 'pickup',
PDF_PRINT: 'pdfPrint',
FILE_SELECT: 'fileSelect',
DEFAULT: 'index',
LOGIN: './login.html',
};
......@@ -45,6 +46,7 @@ CONSTANT.URL_TREE_NAME = {
PICKUP_CONTINUOS: 'pickup.html?pickupActive=continousWork',
PICKUP_WARNING: 'pickup.html?pickupActive=warningReport',
PDF_PRINT: 'pdfPrint.html',
FILE_SELECT: 'fileSelect.html',
};
CONSTANT.PICK_UP_TYPE = {
......@@ -61,6 +63,7 @@ CONSTANT.URL_TREE_PASS = {
5: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
5: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_FORM],
6: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.PDF_PRINT],
6: [CONSTANT.URL_TREE_NAME.OPERATION_LIST, CONSTANT.URL_TREE_NAME.REPORT_LIST, CONSTANT.URL_TREE_NAME.PDF_PRINT, CONSTANT.URL_TREE_NAME.FILE_SELECT],
};
CONSTANT.PAGE_TAB = {
......@@ -121,6 +124,7 @@ CONSTANT.URL = {
LIST_REPORT_FORM: 'listReportForm/showReport',
REPORT_LIST: 'reportList',
QUICK_REPORT_PRINT: 'quickReportPrintWeb/',
PDF_FILE_SELECT: 'pdfFileSelect/',
},
},
WEB: {
......
abweb/common/json/lang/lang-en.json
......@@ -48,6 +48,7 @@
"msgLogoutConfirm": "Do you want to Logout?",
"msgEssential": "{0} is required",
"pdfPrint":"PDF Print",
"fileSelect":"Print File Select",
"msgOperationEmpty": "Operation data is Empty.",
"success": "Success",
"dashboard":"Dashboard",
......
abweb/common/json/lang/lang-ja.json
......@@ -46,6 +46,7 @@
"msgLogoutConfirm": "ログアウトしますか？",
"msgEssential": "{0}は必須です。",
"pdfPrint":"PDF出力",
"fileSelect":"出力ファイル選択",
"msgOperationEmpty": "作業データがありません。",
"success": "成功",
"dashboard":"ダッシュボード",
......
abweb/common/json/lang/lang-ko.json
......@@ -45,6 +45,7 @@
"onlyPrintCms": "해당 IO장표는 관리화면에서만 출력 가능합니다.",
"msgLogoutConfirm": "로그아웃 하시겠습니까?",
"pdfPrint":"PDF 출력",
"fileSelect":"출력 파일 선택",
"msgOperationEmpty": "작업 데이터가 없습니다.",
"success": "성공",
"dashboard":"대시보드",
......
abweb/html/fileSelect.html 0 → 100644
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta http-equiv="Content-Language" content="ja">
<meta name="google" content="notranslate">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<title class="lang" lang="fileSelect"></title>
<!-- favicons -->
<link href="../img/favicon.ico" rel="icon">
<link href="../img/apple-touch-icon.png" rel="apple-touch-icon">
<!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/loading.css">
<link rel="stylesheet" type="text/css" href="../common/css/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/style.css">
<!-- vender css -->
<link rel="stylesheet" type="text/css" href="../common/css/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/i18n.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../js/template/template.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/fileSelect/fileSelect.js?__UPDATEID__"></script>
<script type="text/javascript">
$(document).ready(function() {
FS.init();
});
</script>
</head>
<body>
<div id="loader"></div>
<!-- header -->
<div id="includedHeader"></div>
<span id="loadingNone" style="visibility: hidden;">
<!-- title -->
<div id="includedMainTitle"></div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="fileSelectDiv" ></div>
<!-- confirm -->
<div id="includedConfirmModal"></div>
</span>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/js/fileSelect/fileSelect.js 0 → 100644
/**
* PDF PRINT function js
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
**/
var FS = {};
/**
* init
*/
FS.init = function () {
//Check if user is logged in
COMMON.showLoading();
COMMON.checkAuth(false);
FS.loadCommon();
COMMON.closeLoading();
};
/**
* load common
*/
FS.loadCommon = function () {
TEMPLATE.loadHeader('#includedHeader');
TEMPLATE.loadConfirmModal('#includedConfirmModal');
let navs = [
{
titleLang: CONSTANT.PAGE_NAME.OPERATION_LIST,
href: CONSTANT.URL_TREE_NAME.OPERATION_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.REPORT_LIST,
href: CONSTANT.URL_TREE_NAME.REPORT_LIST,
},
{
titleLang: CONSTANT.PAGE_NAME.PDF_PRINT,
href: CONSTANT.URL_TREE_NAME.PDF_PRINT,
},
{
titleLang: CONSTANT.PAGE_NAME.FILE_SELECT,
}
];
TEMPLATE.loadMainNavsTitle('#includedMainTitle', CONSTANT.PAGE_NAME.FILE_SELECT, navs, FS.initFileList);
};
/**
* init pdf list
*/
FS.initFileList = function () {
if (sessionStorage.getItem("operationId")) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = sessionStorage.getItem("operationId");
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.QUICK_REPORT_PRINT + CONSTANT.URL.CMS.HTML.PDF_FILE_SELECT;
$('#fileSelectDiv').load(url, params);
} else {
COMMON.showAlert('error');
COMMON.avwScreenMove('reportList.html');
}
};
abweb/js/reportList/reportList.js
......@@ -7,9 +7,6 @@
var RL = {};
RL.isQuickReport;
RL.isQRTableInspect;
RL.isQRTableReport;
RL.isQRWholeBook;
/**
* init
......@@ -21,9 +18,6 @@
COMMON.checkQuickReport(function(result) {
if (result) {
RL.isQuickReport = result.isQuickReport;
RL.isQRTableInspect = result.isQRTableInspect;
RL.isQRTableReport = result.isQRTableReport;
RL.isQRWholeBook = result.isQRWholeBook;
};
});
RL.loadCommon();
......@@ -98,13 +92,8 @@
RL.loadMainTitleCallback = function () {
//add dashboard setting item
if (RL.isQuickReport) {
let elmA;
if (RL.isQRTableInspect || RL.isQRTableReport || RL.isQRWholeBook) {
elmA = $("<div id=\"btnPdfPrint\" onclick=\"COMMON.showAlert('onlyPrintCms');\">");
} else {
elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">');
}
let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">');
const elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">');
const elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">');
elmImg.attr('title', I18N.i18nText('reportList'));
elmA.append(elmImg);
$('#mainTitleHeader').after(elmA);
......
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