Skip to content

C
check
Commit ff114348 by Kang Donghun
Options

init method fix

parent f934c42d
Showing with 192 additions and 7 deletions
abweb/common/js/constant.js
...@@ -73,6 +73,7 @@ CONSTANT.URL = { ...@@ -73,6 +73,7 @@ CONSTANT.URL = {
TASK_REPORT_LIST: 'getTaskReport/', TASK_REPORT_LIST: 'getTaskReport/',
LIST_REPORT_FORM: 'listReportForm/showReport', LIST_REPORT_FORM: 'listReportForm/showReport',
REPORT_LIST: 'reportList', REPORT_LIST: 'reportList',
QUICK_REPORT_PRINT: 'quickReportPrintWeb/',
}, },
}, },
WEB: { WEB: {
......
abweb/common/json/lang/lang-en.json
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
"errorOccurred": "Error Occurred", "errorOccurred": "Error Occurred",
"msgLogoutConfirm": "Do you want to Logout?", "msgLogoutConfirm": "Do you want to Logout?",
"msgEssential": "{0} is required", "msgEssential": "{0} is required",
"pdfPrint":"PDF Print",
"dashboard":"Dashboard", "dashboard":"Dashboard",
"dashboardSettings":"Dashboard Settings", "dashboardSettings":"Dashboard Settings",
......
abweb/common/json/lang/lang-ja.json
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
"errorOccurred": "エラーが発生しました", "errorOccurred": "エラーが発生しました",
"msgLogoutConfirm": "ログアウトしますか？", "msgLogoutConfirm": "ログアウトしますか？",
"msgEssential": "{0}は必須です。", "msgEssential": "{0}は必須です。",
"pdfPrint":"PDF出力",
"dashboard":"ダッシュボード", "dashboard":"ダッシュボード",
"dashboardSettings":"ダッシュボード設定", "dashboardSettings":"ダッシュボード設定",
......
abweb/common/json/lang/lang-ko.json
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
"accountInformation":"계정 정보", "accountInformation":"계정 정보",
"errorOccurred": "오류가 발생했습니다", "errorOccurred": "오류가 발생했습니다",
"msgLogoutConfirm": "로그아웃 하시겠습니까?", "msgLogoutConfirm": "로그아웃 하시겠습니까?",
"pdfPrint":"PDF 출력",
"dashboard":"대시보드", "dashboard":"대시보드",
"dashboardSettings":"대시보드 설정", "dashboardSettings":"대시보드 설정",
......
abweb/html/pdfPrint.html 0 → 100644
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title class="lang" lang="pdfPrint"></title>
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<!-- 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/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 src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
PP.init();
});
</script>
</head>
<body>
<!-- header -->
<div id="includedHeader"></div>
<!-- title -->
<div id="main-ttl">
<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"><a href="report-list.html" class="text-decoration-none text-underline">報告一覧</a></li>
<li class="breadcrumb-item active" aria-current="page"><span>pdf出力</span></li>
</ol>
</nav>
<!-- title -->
<h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0">pdf出力</h1>
</div>
</div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap-fluid mb-5" id="pdfPrint">
<main>
<div class="bg-lightblue wide-wrap mb-4">
<div class="container-wrap-fluid py-3">
<h1 class="fs-14 font-weight-bold">検温表Ⅱ</h1>
<div class="font-weight-bold">ver.2 2021/02/12</div>
<section class="bg-white p-3 mt-4">
<div class="block-title mb-3 pb-2">
<h2 class="fs-12 text-center">①日報発行・確認</h2>
</div>
<div class="form-group">
<label for="monthly">月度</label>
<select class="form-control" id="monthly">
<option>月度を選択</option>
<option>…</option>
</select>
</div>
</section>
<section class="bg-white p-3 mt-4">
<div class="block-title mb-3 pb-2">
<h2 class="fs-12 text-center">②検温入力</h2>
</div>
<label for="input_date">入力日</label>
<div class="d-flex">
<div class="form-group">
<div class="input-group date" id="datetimepicker1" data-target-input="nearest">
<input type="text" name="start" class="form-control datetimepicker-input" data-target="#datetimepicker1" placeholder="選択">
<div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker">
<div class="input-group-text"><i class="far fa-calendar"></i></div>
</div>
</div>
</div>
<div class="p-2">
～
</div>
<div class="form-group">
<div class="input-group date" id="datetimepicker2" data-target-input="nearest">
<input type="text" name="end" class="form-control datetimepicker-input" data-target="#datetimepicker2" placeholder="選択">
<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
<div class="input-group-text"><i class="far fa-calendar"></i></div>
</div>
</div>
</div>
</div>
<div class="form-group">
<label for="department">部署</label>
<select class="form-control" id="department">
<option>部署を選択</option>
<option>…</option>
</select>
</div>
<div class="form-group">
<label for="name">名前</label>
<div class="input-group">
<input type="text" class="form-control" id="name" placeholder="名前を入力">
<div class="input-group-append">
<span class="input-group-text">を含む</span>
</div>
</div>
</div>
</section>
</div>
</div>
<div class="text-center">
<button type="submit" class="btn btn-outline-primary pdf-output-btn d-inline-flex">
<div class="icon"></div>
<span class="align-middle">PDFとして出力</span>
</button>
</div>
</main>
</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/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/common.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/reportList.html
...@@ -25,11 +25,13 @@ ...@@ -25,11 +25,13 @@
<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"> <script type="text/javascript">
$(document).ready(function() {
RL.init();
});
</script> </script>
</head> </head>
<body onload="RL.init();"> <body >
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
...@@ -47,7 +49,7 @@ ...@@ -47,7 +49,7 @@
<!-- title --> <!-- title -->
<div class="d-flex align-items-center"> <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">報告一覧</h1> <h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto">報告一覧</h1>
<a href="pdf.html" id="btnPdfPrint"> <a href="" id="btnPdfPrint">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力"> <img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">
</a> </a>
</div> </div>
...@@ -55,14 +57,13 @@ ...@@ -55,14 +57,13 @@
</main> </main>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ --> <!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="task-list"></div> <div class="container-wrap-fluid mb-5" id="task-list"></div>
<!-- confirm --> <!-- confirm -->
<!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
<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 type="text/javascript" src="../common/js/newdash/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/newdash/common.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/web/common.js?__UPDATEID__"></script>
</body> </body>
</html> </html>
abweb/js/pdfPrint/pdfPrint.js 0 → 100644
// PDF PRINT function js
var PP = {};
PP.init = function() {
console.log("PP.init");
PP.loadCommon();
PP.initPdfList();
};
PP.loadCommon = function() {
$("#includedHeader").load("../html/common/header.html" , function() {
I18N.initi18n();
HEADER.init();
});
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() {
I18N.initi18n();
});
}
PP.initPdfList = function() {
if (sessionStorage.OL_operationId) {
let params = {};
params.sid = COMMON.getSid();
params.operationId = sessionStorage.OL_operationId;
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;
$("#pdfPrint").load(url, params);
} else {
COMMON.displayAlert("error");
COMMON.avwScreenMove("reportList.html");
}
}
\ No newline at end of file
abweb/js/reportList/reportList.js
...@@ -34,3 +34,7 @@ RL.initTaskReportList = function() { ...@@ -34,3 +34,7 @@ RL.initTaskReportList = function() {
} }
} }
RL.goPdfPrint = function() {
COMMON.avwScreenMove("pdfPrint.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