Skip to content

C
check
Commit 753be672 by Takumi Imai
Options

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

Feature/1.0 check web dev kdh 2

See merge request !45
parents 6e790414 3dbaa1f6
Showing with 99 additions and 137 deletions
abweb/common/css/app.css
......@@ -11038,7 +11038,7 @@ ul.card-list > li:not(.selected):not(.not-found):hover{
}
.select-card-list .arrow-icon {
background-image: url("../img/icon_arrow_down.svg");
background-image: url("../../img/icon_arrow_down.svg");
background-size: contain;
background-repeat: no-repeat;
width: 14px;
......@@ -20689,7 +20689,7 @@ button {
.type-icon .report:before{
content: '';
background-image: url("../img/type_icon_report.svg");
background-image: url("../../img/type_icon_report.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......@@ -20699,7 +20699,7 @@ button {
}
.type-icon .questionary:before{
content: '';
background-image: url("../img/type_icon_questionary.svg");
background-image: url("../../img/type_icon_questionary.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......@@ -20709,7 +20709,7 @@ button {
}
.type-icon .inspection:before{
content: '';
background-image: url("../img/type_icon_inspection.svg");
background-image: url("../../img/type_icon_inspection.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......@@ -20719,7 +20719,7 @@ button {
}
.type-icon .proccess:before{
content: '';
background-image: url("../img/type_icon_proccess.svg");
background-image: url("../../img/type_icon_proccess.svg");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
......
abweb/common/css/style.css
@charset "UTF-8";
#main{
#main-ttl{
margin-top: 80px;
}
@media screen and (max-width: 575px) {
#main {
#main-ttl {
margin-top: 60px;
}
}
......
abweb/common/html/header.html
<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">
<a href="dashboard.html" class="navbar-brand">
<img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
......
abweb/common/html/mainNavTitle.html
<div id="main-ttl">
<div class="container">
<div class="container-wrap" id="mainNavTitleDiv">
<!-- breadcrumb -->
<nav id="mainTitleNavs" aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0"></ol>
</nav>
<!-- 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>
\ No newline at end of file
abweb/common/html/mainTitle.html
<div id="main-ttl">
<div class="container">
<div class="container-wrap">
<!-- title -->
<div class="d-flex align-items-center">
<h1 id="mainTitleHeader" class="fs-14 font-weight-bold pt-4 pb-3 mb-0 mr-auto lang"></h1>
......
abweb/common/js/app.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
abweb/common/js/constant.js
......@@ -65,6 +65,8 @@ CONSTANT.URL = {
PUSH_MESSAGE_DETAIL: 'pushMessageDetail/',
PUSH_MESSAGE_LIST: 'pushMessageList/',
SEND_PUSH_MESSAGE: 'sendPushMessage/',
IS_QUICK_REPORT: 'getOperationData/isQuickReport',
},
HTML: {
BASE: 'html/',
......
abweb/common/json/lang/lang-en.json
......@@ -47,6 +47,7 @@
"msgLogoutConfirm": "Do you want to Logout?",
"msgEssential": "{0} is required",
"pdfPrint":"PDF Print",
"msgOperationEmpty": "Operation data is Empty.",
"dashboard":"Dashboard",
"dashboardSettings":"Dashboard Settings",
......
abweb/common/json/lang/lang-ja.json
......@@ -45,6 +45,7 @@
"msgLogoutConfirm": "ログアウトしますか？",
"msgEssential": "{0}は必須です。",
"pdfPrint":"PDF出力",
"msgOperationEmpty": "作業データがありません。",
"dashboard":"ダッシュボード",
"dashboardSettings":"ダッシュボード設定",
......
abweb/common/json/lang/lang-ko.json
......@@ -44,6 +44,7 @@
"errorOccurred": "오류가 발생했습니다",
"msgLogoutConfirm": "로그아웃 하시겠습니까?",
"pdfPrint":"PDF 출력",
"msgOperationEmpty": "작업 데이터가 없습니다.",
"dashboard":"대시보드",
"dashboardSettings":"대시보드 설정",
......
abweb/common/json/sys/conf.json
{
"1apiUrl" : "http://localhost:8080/acms/{0}/abvapi",
"1checkApiUrl" : "http://localhost:8080/acms/{0}/checkapi/web/",
"1apiLoginUrl" : "http://localhost:8080/acms/nuabvapi",
"1apiResourceDlUrl" : "http://localhost:8080/acms/{0}/dl",
"apiUrl" : "https://chatdev2.agentec.jp/acms/{0}/abvapi",
"checkApiUrl" : "https://chatdev2.agentec.jp/acms/{0}/checkapi/web/",
"apiLoginUrl" : "https://chatdev2.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "https://chatdev2.agentec.jp/acms/{0}/dl",
"apiUrl" : "http://localhost:8080/acms/{0}/abvapi",
"checkApiUrl" : "http://localhost:8080/acms/{0}/checkapi/web/",
"apiLoginUrl" : "http://localhost:8080/acms/nuabvapi",
"apiResourceDlUrl" : "http://localhost:8080/acms/{0}/dl",
"1apiUrl" : "https://chatdev2.agentec.jp/acms/{0}/abvapi",
"1checkApiUrl" : "https://chatdev2.agentec.jp/acms/{0}/checkapi/web/",
"1apiLoginUrl" : "https://chatdev2.agentec.jp/acms/nuabvapi",
"1apiResourceDlUrl" : "https://chatdev2.agentec.jp/acms/{0}/dl",
"bookShelfCount" : 15,
"bookListCount" : 15,
"screenlockTimeDefault" : 30,
......
abweb/html/dashboard.html
......@@ -20,6 +20,9 @@
<script type="text/javascript" src="../common/js/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="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.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" src="../js/header/header.js"></script>
......@@ -64,7 +67,5 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
<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/html/index.html
......@@ -21,6 +21,8 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script src="../js/operationList/operationList.js?__UPDATEID__"></script>
......@@ -144,7 +146,5 @@
<p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='######' /></div>
</div>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
abweb/html/pdfPrint.html
......@@ -24,7 +24,9 @@
<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/pdfPrint/pdfPrint.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.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();
......@@ -54,87 +56,13 @@
</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>
<div class="container-wrap mb-5" id="pdfPrint"></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 src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/pickup.html
......@@ -22,12 +22,17 @@
<script src="../common/js/common.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="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<!-- main js -->
<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/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="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
<script type="text/javascript" src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/pickup/pickup.js"></script>
......@@ -135,8 +140,6 @@
<!-- confirm -->
<div id="includedConfirmModal"></div>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
\ No newline at end of file
abweb/html/reportList.html
......@@ -21,12 +21,16 @@
<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="../js/header/header.js?__UPDATEID__"></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="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.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() {
RL.init();
console.log("RL.isQuickReport : " + RL.isQuickReport);
});
</script>
</head>
......@@ -35,35 +39,15 @@
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- report list -->
<main>
<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 active" aria-current="page"><span>報告一覧</span></li>
</ol>
</nav>
<!-- title -->
<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>
<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出力">
</a>
</div>
</div>
</main>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="reportList"></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 src="../common/js/event.js?__UPDATEID__"></script>
</body>
</html>
abweb/js/reportList/reportList.js
......@@ -10,20 +10,46 @@ RL.init = function () {
//Check if user is logged in
COMMON.checkAuth(false);
console.log('ReportList init start');
RL.checkQuickReport();
RL.loadCommon();
RL.initTaskReportList();
};
RL.loadCommon = function () {
$('#includedHeader').load('../common/html/header.html', function () {
I18N.initi18n();
HEADER.init();
});
$('#includedConfirmModal').load('../common/html/confirmModal.html', function () {
I18N.initi18n();
});
};
RL.loadCommon = function() {
TEMPLATE.loadHearder("#includedHeader");
TEMPLATE.loadConfirmModal("#includedConfirmModal");
const navs = [
{
titleLang: 'dashboard',
href: 'dashboard.html',
},
{
titleLang: 'pickup',
},
];
TEMPLATE.loadMainNavsTitle("#includedMainTitle", "reportList", navs, RL.loadMainTitleCallback);
}
RL.isQuickReport;
RL.checkQuickReport = 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.API.IS_QUICK_REPORT;
COMMON.cmsAjax(url, params, false, function(result) {
RL.isQuickReport = result.isQuickReport;
}, function() {
COMMON.displayAlert("msgOperationEmpty");
COMMON.avwScreenMove("index.html");
});
} else {
COMMON.displayAlert("error");
COMMON.avwScreenMove("index.html");
}
}
RL.initTaskReportList = function () {
if (sessionStorage.OL_operationId) {
......@@ -39,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 () {
COMMON.avwScreenMove('pdfPrint.html');
};
abweb/js/template/template.js
......@@ -15,6 +15,7 @@ TEMPLATE.loadHearder = function (elmentId) {
$('#iconHomeDashboard').addClass('active');
}
I18N.initi18n();
HEADER.init();
});
};
......
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