Skip to content

C
check
Commit 4f53e449 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 !38
parents 43194926 3f1cd555
Showing with 384 additions and 40 deletions
abweb/common/js/constant.js
......@@ -73,6 +73,7 @@ CONSTANT.URL = {
TASK_REPORT_LIST: 'getTaskReport/',
LIST_REPORT_FORM: 'listReportForm/showReport',
REPORT_LIST: 'reportList',
QUICK_REPORT_PRINT: 'quickReportPrintWeb/',
},
},
WEB: {
......
abweb/common/js/web/common.js 0 → 100644
$(function(){
hide_del_btn();
});
// 追加ボタン押下
$('.add').on('click',function(){
var base = $(this).parent().parent().parent('.tb-item');
base.find('.del').show();
// 入力フォームをクローン
base.clone(true).insertAfter(base);
// 追加した要素にスクロール
$("html,body").animate({scrollTop:base.next().offset().top});
// 入力フォームアコーディオン表示
base.parent().parent('.tb').find('.ac-tb-form').show();
});
// 削除ボタン押下
$('.del').on('click',function(){
var base = $(this).parent().parent().parent('.tb-item');
var tbwrap = base.parent('.tb-wrap');
var tb = tbwrap.parent('.tb');
// エリアの削除
base.remove();
// ボタンの表示非表示切り替え
hide_del_btn();
// フォームエリア表示切り替え
tbWrapClear(tbwrap);
// 折りたたみアイコン非表示
if(tb.find('.ac-tb-form').is(':hidden')){
tb.find('.fold-area').addClass('hide');
}
});
// 閉じるボタン押下
$('.close-window').on('click',function(){
window.close();
});
// 表領域のフォームが一つの時、削除ボタンを非表示
function hide_del_btn(){
$('.tb-wrap').each(function(i, elem){
var len = $(elem).find('.tb-item').length;
//表の項目が一つの場合
if(len <= 1){
$(elem).find('.del').hide();
$(this).children('.tb-item').removeClass('visually-hidden');
// 入力フォームアコーディオン非表示
$(this).parent().find('.ac-tb-form').hide();
}
});
}
// アコーディオンを閉めている際にフォームを削除した場合
// 子要素がすべて非表示の場合、親要素を非表示とする
function tbWrapClear(tbwrap){
if(tbwrap.children(':not(.visually-hidden)').length == 0){
tbwrap.addClass("visually-hidden");
}
else {
tbwrap.removeClass("visually-hidden");
}
}
// 入力フォームアコーディオン
$('.ac-tb-form').on('click',function(){
var tb = $(this).parent().parent().parent('.tb');
var elems = tb.find('.tb-wrap').find('.tb-item');
var tbwrap = tb.find('.tb-wrap');
if(!$(this).hasClass('hide')){
elems.each(function(i) {
i = i + 1;
if( i != elems.size()){
$(this).addClass('visually-hidden');
}
});
$(this).text('開く');
// フォームエリア表示切り替え
tbWrapClear(tbwrap);
// 折りたたみアイコン表示
tb.find('.fold-area').removeClass('hide');
}else{
elems.removeClass('visually-hidden');
$(this).text('閉じる');
// フォームエリア表示切り替え
tbWrapClear(tbwrap);
// 折りたたみアイコン非表示
tb.find('.fold-area').addClass('hide');
}
// 開閉
$(this).toggleClass("hide");
});
// トグル切り替え
$(".toggle").on("click", function() {
$(this).toggleClass("checked");
if(!$('input[name="check"]').prop("checked")) {
$(".toggle input").prop("checked", true);
} else {
$(".toggle input").prop("checked", false);
}
});
// メニュー表示
$('.c-dropdown-trigger').on("click",function(){
$('[data-target="' + $(this).attr('id') + '"]').toggleClass('show');
$('.mask').removeClass('hide');
});
// メニューを閉じる
$('.mask').on("click",function(){
$('.mask').addClass('hide');
$('.c-dropdown-menu').removeClass('show');
});
// カードリスト選択
$('.select-card-list .card .select-label').on("click",function(){
$(this).closest('.select-card-list').find('.card').removeClass('selected');
$(this).closest('.card').addClass('selected');
});
// リスト表示切替(リスト表示)
$('.view-menu .view-list-btn').on("click",function(){
$('.view-block-btn').removeClass('active');
$('.view-list-btn').addClass('active');
$('.view-content').removeClass('view-block');
$('.view-content').addClass('view-list');
});
// リスト表示切替(グリッド表示)
$('.view-menu .view-block-btn').on("click",function(){
$('.view-list-btn').removeClass('active');
$('.view-block-btn').addClass('active');
$('.view-content').removeClass('view-list');
$('.view-content').addClass('view-block');
});
// ローディング
$(function(){
function e() {
setTimeout(function(){
$.LoadingOverlay("hide");
}, 2000);
}
$(".search-form-btn").on('click', function(){
$.LoadingOverlay("show", {
image : "img/loading.gif"
});
e();
});
});
abweb/common/json/lang/lang-en.json
......@@ -46,6 +46,7 @@
"errorOccurred": "Error Occurred",
"msgLogoutConfirm": "Do you want to Logout?",
"msgEssential": "{0} is required",
"pdfPrint":"PDF Print",
"dashboard":"Dashboard",
"dashboardSettings":"Dashboard Settings",
......
abweb/common/json/lang/lang-ja.json
......@@ -44,6 +44,7 @@
"errorOccurred": "エラーが発生しました",
"msgLogoutConfirm": "ログアウトしますか？",
"msgEssential": "{0}は必須です。",
"pdfPrint":"PDF出力",
"dashboard":"ダッシュボード",
"dashboardSettings":"ダッシュボード設定",
......
abweb/common/json/lang/lang-ko.json
......@@ -43,6 +43,7 @@
"accountInformation":"계정 정보",
"errorOccurred": "오류가 발생했습니다",
"msgLogoutConfirm": "로그아웃 하시겠습니까?",
"pdfPrint":"PDF 출력",
"dashboard":"대시보드",
"dashboardSettings":"대시보드 설정",
......
abweb/html/dashboard.html
......@@ -42,7 +42,7 @@
<div id="includedMainTitle"></div>
<!-- dashboard -->
<main>
<div class="container">
<div class="container-wrap">
<!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup"></h2>
......
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/pickup.html
......@@ -50,7 +50,7 @@
<div id="includedMainTitle"></div>
<!-- pickup -->
<main>
<div class="container">
<div class="container-wrap">
<!-- tab -->
<ul class="nav nav-tabs line" id="myTab" role="tablist">
<li class="nav-item" id="liTabNewReport">
......
abweb/html/push-message-detail.html
......@@ -42,7 +42,7 @@
<div id="includedMainTitle"></div>
<!-- message detail -->
<main>
<div class="container">
<div class="container-wrap">
<div class="row">
<div class="col-12">
<div class="card p-4">
......
abweb/html/push-message-list.html
......@@ -42,7 +42,7 @@
<div id="includedMainTitle"></div>
<!-- message list -->
<main>
<div class="container">
<div class="container-wrap">
<!-- message -->
<ul class="card-list message-list p-0" id="messageList">
<li class="card mb-2 not-found d-none">
......
abweb/html/reportList.html
......@@ -25,11 +25,13 @@
<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();
});
</script>
</head>
<body onload="RL.init();">
<body >
<!-- header -->
<div id="includedHeader"></div>
......@@ -47,7 +49,7 @@
<!-- 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="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出力">
</a>
</div>
......@@ -55,14 +57,13 @@
</main>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-wrap mb-5" id="task-list"></div>
<div class="container-wrap mb-5" id="reportList"></div>
<!-- confirm -->
<!-- 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/newdash/app.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/newdash/common.js?__UPDATEID__"></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>
abweb/html/send-message.html
......@@ -44,7 +44,7 @@
<div id="includedMainTitle"></div>
<!-- send message -->
<main>
<div class="container">
<div class="container-wrap">
<!-- content -->
<div class="py-2">
<div class="row">
......
abweb/js/login/login.js
......@@ -533,7 +533,6 @@ LOGIN.ready = function() {
I18N.initi18n();
var sysSettings = COMMON.sysSetting(); // get info in conf.json
// check an getits setting
if (sysSettings.apiUrl == "") {
......
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
......@@ -3,7 +3,7 @@
var RL = {};
RL.init = function() {
console.log("kdh check ok");
console.log("ReportList init start");
// COMMON.checkAuth(true);
RL.loadCommon();
......@@ -27,10 +27,14 @@ RL.initTaskReportList = function() {
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.TASK_REPORT_LIST;
$("#task-list").load(url, params);
$("#reportList").load(url, params);
} else {
COMMON.displayAlert("error");
COMMON.avwScreenMove("taskList.html");
COMMON.avwScreenMove("index.html");
}
}
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