Skip to content

C
check
Commit 5176e72b by Kang Donghun
Options

design application

parent 0a9ab603
Showing with 33 additions and 114 deletions
abweb/common/css/appCommon/style.css
@charset "UTF-8"; @charset "UTF-8";
#main{ #main-ttl{
margin-top: 80px; margin-top: 80px;
} }
@media screen and (max-width: 575px) { @media screen and (max-width: 575px) {
#main { #main-ttl {
margin-top: 60px; margin-top: 60px;
} }
} }
......
abweb/common/html/mainNavTitle.html
<div id="main-ttl"> <div id="main-ttl">
<div class="container-wrap"> <div class="container-wrap" id="mainNavTitleDiv">
<!-- breadcrumb --> <!-- breadcrumb -->
<nav id="mainTitleNavs" aria-label="breadcrumb"> <nav id="mainTitleNavs" aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0"></ol> <ol class="breadcrumb px-0 mb-0"></ol>
</nav> </nav>
<!-- title --> <!-- title -->
<h1 id="mainTitleHeader" class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 lang"></h1> <div class="d-flex align-items-center">
<h1 id="mainTitleHeader" class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto lang"></h1>
</div>
</div> </div>
</div> </div>
\ No newline at end of file
abweb/html/common/header.html
<header> <header>
<nav class="navbar navbar-dark shadow-sm px-sm-auto px-0"> <nav class="navbar navbar-dark shadow-sm px-sm-auto px-0 position-fixed fixed-top bg-white">
<div class="container-wrap"> <div class="container-wrap">
<a href="dashboard.html" class="navbar-brand"> <a href="dashboard.html" class="navbar-brand">
<img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo"> <img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
......
abweb/html/index.html
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<script src="../common/js/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/template/template.js?__UPDATEID__"></script> <script src="../js/template/template.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script> <script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script> <script src="../common/js/web/app.js?__UPDATEID__" defer></script>
<script src="../js/reportForm/reportForm.js?__UPDATEID__" defer></script> <script src="../js/reportForm/reportForm.js?__UPDATEID__" defer></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/pdfPrint.html
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
<script type="text/javascript" src="../js/header/header.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 type="text/javascript" src="../js/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/common.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 type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
...@@ -54,87 +55,11 @@ ...@@ -54,87 +55,11 @@
</div> </div>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ --> <!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap-fluid mb-5" id="pdfPrint"> <div class="container-wrap mb-5" id="pdfPrint"></div>
<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 --> <!-- 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 type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/common.js?__UPDATEID__"></script>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/html/reportList.html
...@@ -24,10 +24,13 @@ ...@@ -24,10 +24,13 @@
<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>
<script type="text/javascript" src="../common/js/web/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/common.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 type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
RL.init(); RL.init();
console.log("RL.isQuickReport : " + RL.isQuickReport);
}); });
</script> </script>
</head> </head>
...@@ -39,31 +42,11 @@ ...@@ -39,31 +42,11 @@
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<!-- report list --> <!-- report list -->
<!-- <main>
<div class="container-wrap">
<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 active" aria-current="page"><span>報告一覧</span></li>
</ol>
</nav>
<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>
<div id="btnPdfPrint">
<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdf出力">
</div>
</div>
</div>
</main> -->
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="reportList"></div> <div class="container-wrap mb-5" id="reportList"></div>
<!-- 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 type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/web/common.js?__UPDATEID__"></script>
</body> </body>
</html> </html>
abweb/js/reportList/reportList.js
...@@ -10,8 +10,8 @@ RL.init = function () { ...@@ -10,8 +10,8 @@ RL.init = function () {
//Check if user is logged in //Check if user is logged in
COMMON.checkAuth(false); COMMON.checkAuth(false);
console.log('ReportList init start'); console.log('ReportList init start');
RL.loadCommon();
RL.checkQuickReport(); RL.checkQuickReport();
RL.loadCommon();
RL.initTaskReportList(); RL.initTaskReportList();
}; };
...@@ -27,9 +27,11 @@ RL.loadCommon = function() { ...@@ -27,9 +27,11 @@ RL.loadCommon = function() {
titleLang: 'pickup', titleLang: 'pickup',
}, },
]; ];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "reportList", navs, null); TEMPLATE.loadMainNavsTitle("#includedMainTitle", "reportList", navs, RL.loadMainTitleCallback);
} }
RL.isQuickReport;
RL.checkQuickReport = function() { RL.checkQuickReport = function() {
if (sessionStorage.OL_operationId) { if (sessionStorage.OL_operationId) {
let params = {}; let params = {};
...@@ -38,12 +40,7 @@ RL.checkQuickReport = function() { ...@@ -38,12 +40,7 @@ RL.checkQuickReport = function() {
params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST; params.returnUrl = CONSTANT.URL.WEB.BASE + CONSTANT.URL.WEB.OPERATION_LIST;
let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT; let url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.API.IS_QUICK_REPORT;
COMMON.cmsAjax(url, params, false, function(result) { COMMON.cmsAjax(url, params, false, function(result) {
if (result.isQuickReport) { RL.isQuickReport = result.isQuickReport;
$("#btnPdfPrint").click(RL.goPdfPrint);
$("#btnPdfPrint").show();
} else {
$("#btnPdfPrint").hide();
}
}, function() { }, function() {
COMMON.displayAlert("msgOperationEmpty"); COMMON.displayAlert("msgOperationEmpty");
COMMON.avwScreenMove("index.html"); COMMON.avwScreenMove("index.html");
...@@ -68,6 +65,18 @@ RL.initTaskReportList = function () { ...@@ -68,6 +65,18 @@ RL.initTaskReportList = function () {
} }
}; };
RL.loadMainTitleCallback = function () {
//add dashboard setting item
if (RL.isQuickReport) {
var 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="pdf出力">');
elmImg.attr('title', I18N.i18nText('reportList'));
elmA.append(elmImg);
$('#mainTitleHeader').after(elmA);
}
};
RL.goPdfPrint = function () { RL.goPdfPrint = function () {
COMMON.avwScreenMove('pdfPrint.html'); 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