Skip to content

D
design
Commit e625e830 by Lee Munkyeong
Options

Merge branch 'feature/1.4.0' of https://gitlab.agentec.jp/abookCheck/design into feature/1.4.0

parents b76def66 21093928
Showing with 27 additions and 867 deletions
app/form_output.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title>帳票出力｜A Book Check</title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="A Book Check">
<link rel="stylesheet" type="text/css" href="css/app.css">
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
</head>
<body>
<header>
<nav class="navbar navbar-dark bg-primary">
<a href="index.html" class="navbar-brand category-btn lht-0">
<i class="fas fa-chevron-left fs-12 p-1"></i>
<span class="d-none d-md-inline fs-10">
戻る
</span>
</a>
<div class="d-block text-white">
<div class="page_title">
帳票出力
</div>
</div>
<div></div>
</nav>
</header>
<div class="container-fluid mb-5">
<main>
<div class="bg-lightblue wide-wrap mb-4">
<div class="container-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">
<i class="fas fa-print fs-12 mr-2"></i>
PDFとして出力
</button>
</div>
</main>
</div>
<script type="text/javascript" src="js/app.js" defer></script>
</body>
</html>
app/list.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title>作業一覧｜A Book Check</title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="eXFrame">
<link rel="stylesheet" type="text/css" href="css/app.css">
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
</head>
<body>
<header>
<nav class="navbar navbar-dark bg-primary">
<a href="index.html" class="navbar-brand category-btn lht-0">
<i class="fas fa-chevron-left fs-12 p-1"></i>
<span class="d-none d-md-inline fs-10">
戻る
</span>
</a>
<a href="form_output.html" class="nav-link text-white lht-0 p-1">
<i class="fas fa-clipboard-list fs-12 p-1"></i>
<span class="d-none d-md-inline fs-10">
帳票出力
</span>
</a>
</nav>
</header>
<div class="container-fluid mb-5">
<main>
<div class="bg-lightblue wide-wrap mb-4">
<div class="container-fluid py-3">
<h1 class="fs-14 font-weight-bold mb-3">タイトル作業名</h1>
<div class="lht-0 mb-2">
<i class="far fa-clock text-primary"></i>
<span>2021/02/10</span>~<span>2021/02/11</span>
</div>
<form class="d-flex">
<div class="w-99 w-md-50 w-lg-30 mr-2 mb-2">
<label for="job-title" class="sr-only">search</label>
<input type="text" class="form-control" id="job-title" placeholder="作業名">
</div>
<button type="submit" class="btn btn-outline-primary fs-8 py-2 mb-2 text-nowrap flex-shrink-1">検索</button>
</form>
</div>
</div>
<section>
<div class="row align-items-end mb-3">
<div class="col-6">
<a href="report_form.html" class="btn btn-outline-primary fs-8 py-2">報告追加</a>
</div>
<div class="col-6 text-right">
<div class="fs-8">合計箇所：5カ所</div>
</div>
</div>
</section>
<section>
<article class="rounded border px-3 py-2 mb-3">
<a href="report_form_edit.html" class="d-flex text-decoration-none text-dark">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">タイトルテキストタイトルテキストタイトルテキストテキストテキストテキストテキストテキストテキスト</h2>
<div class="d-flex justify-content-between align-items-center">
<div class="user-id align-middle">ma0001-ma0001</div>
<div class="report-status status-completed lht-0 fs-9 font-weight-bold text-primary">
<i class="fas fa-check-circle"></i>
完了
</div>
</div>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</a>
</article>
<article class="rounded border px-3 py-2 mb-3">
<a href="report_form_edit.html" class="d-flex text-decoration-none text-dark">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">タイトルテキストタイトルテキストタイトルテキストテキストテキストテキストテキストテキストテキストタイトルテキストタイトルテキストタイトルテキストテキストテキストテキストテキストテキストテキストタイトルテキストタイトルテキストタイトルテキストテキストテキストテキストテキストテキストテキスト</h2>
<div class="d-flex justify-content-between align-items-center">
<div class="user-id align-middle">ma0001-ma0001</div>
<div class="report-status status-completed lht-0 fs-9 font-weight-bold text-warning">
<i class="fas fa-stopwatch"></i>
進行中
</div>
</div>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</a>
</article>
<article class="rounded border px-3 py-2 mb-3">
<a href="report_form_edit.html" class="d-flex text-decoration-none text-dark">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">タイトルテキストタイトルテキストタイトルテキストテキストテキストテキストテキストテキストテキスト</h2>
<div class="d-flex justify-content-between align-items-center">
<div class="user-id align-middle">ma0001-ma0001</div>
<div class="report-status status-completed lht-0 fs-9 font-weight-bold text-primary">
<i class="fas fa-check-circle"></i>
完了
</div>
</div>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</a>
</article>
<article class="rounded border px-3 py-2 mb-3">
<a href="report_form_edit.html" class="d-flex text-decoration-none text-dark">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">タイトルテキストタイトルテキストタイトルテキストテキストテキストテキストテキストテキストテキスト</h2>
<div class="d-flex justify-content-between align-items-center">
<div class="user-id align-middle">ma0001-ma0001</div>
<div class="report-status status-completed lht-0 fs-9 font-weight-bold text-warning">
<i class="fas fa-stopwatch"></i>
進行中
</div>
</div>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</a>
</article>
</section>
</main>
</div>
<script type="text/javascript" src="js/app.js" defer></script>
</body>
</html>
app/list_0match_202105.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title>作業一覧（0マッチ）</title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="eXFrame">
<link rel="stylesheet" type="text/css" href="css/style_202104.css">
<link rel="stylesheet" type="text/css" href="css/app.css">
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
<script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
</head>
<body>
<?php include('common/simple_header.html');?>
<div class="container-fluid mb-5">
<main>
<h1 class="sr-only">作業一覧</h1>
<div class="bg-lightblue wide-wrap">
<div class="container-fluid py-3">
<form>
<!-- 作業名検索 -->
<div class="w-99 w-md-50 w-lg-30 mr-2 mb-2">
<label for="job-title" class="sr-only">search</label>
<input type="text" class="form-control" id="job-title" placeholder="作業名を入力">
</div>
<div class="d-flex">
<!-- 作業ステータス -->
<div class="form-group mb-2 w-99 w-md-50 w-lg-30 mr-3">
<select class="form-control" id="tast-status">
<option>すべて</option>
<option>進行中</option>
<option>完了</option>
</select>
</div>
<button type="submit" class="btn btn-outline-primary fs-8 py-2 mb-2 text-nowrap flex-shrink-1">検索</button>
</div>
</form>
</div>
</div>
<section>
<div class="my-3 text-center font-weight-bold">
登録されている作業はありません
</div>
</section>
</main>
</div>
<script type="text/javascript" src="js/app_202104.js" defer></script>
<script type="text/javascript" src="js/app.js" defer></script>
</body>
</html>
app/modal_sample_202105.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title>モーダル</title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="A Book Check">
<link rel="stylesheet" type="text/css" href="css/style_202104.css">
<link rel="stylesheet" type="text/css" href="css/modal_202105.css">
<link rel="stylesheet" type="text/css" href="css/app.css">
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
<script type="text/javascript" src="js/jquery-1.11.2.min.js"></script>
</head>
<body>
<div class="container-fluid mb-5">
<main>
<div class="my-5"></div>
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal">
モーダルボタン
</button>
<!-- Modal -->
<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="modalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title font-weight-bold" id="modalTitle">確認</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body font-weight-bold text-center">
すべての工程を削除しますか？
</div>
<div class="modal-footer">
<button type="button" class="btn border-1 btn-primary">　OK　</button>
<button type="button" class="btn border-1 border-secondary" data-dismiss="modal">キャンセル</button>
</div>
</div>
</div>
</div>
</main>
</div>
<script type="text/javascript" src="js/app_202104.js" defer></script>
<script type="text/javascript" src="js/app.js" defer></script>
</body>
</html>
app/process_list_202105.html deleted 100644 → 0
<div class="container-fluid" id="process-list-overlay">
<main id="process-list">
<div class="bg-lightblue wide-wrap">
<h1 class="pl-3 mt-4 font-weight-bold">工程一覧</h1>
<div class="container-fluid py-3">
<div class="py-3 px-3 bg-white">
<!-- 作業 -->
<article class="rounded border my-1">
<a href="report_form_202104.html" class="w-100 text-left text-decoration-none text-dark btn">
<div class="ar-box d-flex">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">見積書</h2>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</div>
</a>
</article>
<article class="rounded border my-1">
<a href="report_form_paging_202104.html" class="w-100 text-left text-decoration-none text-dark btn">
<div class="ar-box d-flex">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">内訳入力1</h2>
<div class="d-flex justify-content-between align-items-center">
<div class="align-middle"><i class="fas fa-users pr-2"></i>承認グループ名</div>
</div>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</div>
</a>
</article>
<div class="text-center my-2 sp-down">
<img src="img/sort-down-solid.png" alt="下三角">
</div>
<!-- 作業 -->
<article class="rounded border my-1">
<a href="report_form_202104.html" class="w-100 text-left text-decoration-none text-dark btn btn-secondary disabled" tabindex="-1" role="button" aria-disabled="true">
<div class="ar-box d-flex">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">内訳入力2</h2>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</div>
</a>
</article>
<div class="text-center my-2 sp-down">
<img src="img/sort-down-solid.png" alt="下三角">
</div>
<!-- 作業 -->
<article class="rounded border my-1">
<a href="report_form_202104.html" class="w-100 text-left text-decoration-none text-dark btn btn-secondary disabled" tabindex="-1" role="button" aria-disabled="true">
<div class="ar-box d-flex">
<div class="w-100">
<h2 class="fs-10 mb-1 lht-14">内訳入力3</h2>
<div class="d-flex justify-content-between align-items-center">
<div class="align-middle"><i class="fas fa-users pr-2"></i>承認グループ名</div>
</div>
</div>
<div class="flex-shrink-1 ml-3 align-self-center">
<div class="next-icon">
<div class="bg-primary rounded-circle">
<i class="fas fa-chevron-right fs-9 text-white"></i>
</div>
</div>
</div>
</div>
</a>
</article>
</div>
</div>
</div>
<div class="px-3 pt-2 text-left bg-lightblue wide-wrap">
<button type="button" class="btn btn-outline-primary fs-8 py-2 mb-4 text-nowrap flex-shrink-1" data-toggle="modal" data-target="#modal">すべて削除</button>
</div>
</main>
</div>
<!-- Modal -->
<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="modalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title font-weight-bold" id="modalTitle">確認</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body font-weight-bold text-center">
すべての工程を削除しますか？
</div>
<div class="modal-footer">
<form action="list_0match_202105.html" method="post">
<button type="submit" class="btn border-1 btn-primary">　OK　</button>
</form>
<button type="button" class="btn border-1 border-secondary" data-dismiss="modal">キャンセル</button>
</div>
</div>
</div>
</div>
app/report_form.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title>報告｜A Book Check</title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="A Book Check">
<link rel="stylesheet" type="text/css" href="css/app.css">
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
</head>
<body>
<header>
<nav class="navbar navbar-dark bg-primary">
<a href="index.html" class="navbar-brand category-btn lht-0">
<i class="fas fa-chevron-left fs-12 p-1"></i>
<span class="d-none d-md-inline fs-10">
戻る
</span>
</a>
<div class="navbar-nav">
<div class="nav-item">
<div class="text-size btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-white btn-sm border size-button smaller"><i class="fas fa-minus"></i></button>
<button type="button" class="btn btn-white btn-sm border size-button defaulter"><i class="fas fa-font"></i></button>
<button type="button" class="btn btn-white btn-sm border size-button larger"><i class="fas fa-plus"></i></button>
</div>
</div>
</div>
</nav>
</header>
<div class="container-fluid mb-5">
<main>
<div class="row">
<div class="col-12 col-lg-8 offset-lg-2 bg-lightblue mt-0 mt-lg-5 mb-1px">
<h4 class="accordion-title fs-12 py-2 m-0" data-toggle="collapse" href="#group1" role="button" aria-expanded="true" aria-controls="group1">
グループ 1/3
</h4>
<div class="bg-white mb-3 collapse show" id="group1">
<div class="p-3">
<div class="form-group mb-4">
<label for="workCode">作業コード <span class="badge badge-danger">必須</span></label>
<input type="workCode" class="form-control" id="workCode" aria-describedby="workCodeHelp">
<small id="workCodeHelp" class="form-text text-muted">入力できるのは全角半角問わず20文字以内です</small>
</div>
<div class="form-group mb-4">
<label for="datetimepicker1">入力日</label>
<div class="input-group date" id="datetimepicker1" data-target-input="nearest">
<input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1" aria-describedby="datetimepicker1Help">
<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>
<small id="datetimepicker1Help" class="form-text text-muted">
<i class="fas fa-file-alt fs-10 text-primary"></i>
<a href="" class="text-secondary">
マニュアル
</a>
</small>
</div>
<div class="form-group mb-4">
<label for="department">
部署 <span class="badge badge-danger">必須</span>
<i class="fas fa-question-circle text-secondary" data-toggle="tooltip" data-placement="top" title="ABookCheckの管理画面で登録した作業グループから選択します。作業グループが多い場合は検索窓にグループ名の一部を入力して選択肢を探すことができます。"></i>
</label>
<select class="form-control" id="department">
<option>部署を選択</option>
<option>…</option>
</select>
</div>
<div class="form-group">
<label for="name">名前 <span class="badge badge-danger">必須</span></label>
<input type="name" class="form-control" id="name" aria-describedby="nameHelp">
</div>
</div>
</div>
</div>
<div class="col-12 col-lg-8 offset-lg-2 bg-lightblue mb-1px">
<h4 class="accordion-title fs-12 py-2 m-0 collapsed" data-toggle="collapse" href="#group2" role="button" aria-expanded="false" aria-controls="group2">
グループ 2/3
</h4>
<div class="bg-white mb-3 collapse" id="group2">
<div class="p-3">
form
</div>
</div>
</div>
<div class="col-12 col-lg-8 offset-lg-2 bg-lightblue mb-1px">
<h4 class="accordion-title fs-12 py-2 m-0 collapsed" data-toggle="collapse" href="#group3" role="button" aria-expanded="false" aria-controls="group3">
グループ 3/3
</h4>
<div class="bg-white mb-3 collapse" id="group3">
<div class="p-3">
form
</div>
</div>
</div>
<div class="col-12 col-lg-8 offset-lg-2 d-flex">
<div class="p-2 flex-grow-1">
</div>
<div class="p-2">
<button class="btn btn-outline-primary">保存</button>
</div>
<div class="p-2">
<button class="btn btn-outline-primary">送信</button>
</div>
</div>
</div>
</main>
</div>
<script type="text/javascript" src="js/app.js" defer></script>
</body>
</html>
\ No newline at end of file
app/report_form_edit.html deleted 100644 → 0
<!DOCTYPE html>
<html lang="ja-JP">
<head>
<meta charset="utf-8">
<title>報告（更新）｜A Book Check</title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="A Book Check">
<link rel="stylesheet" type="text/css" href="css/app.css">
<link rel="stylesheet" type="text/css" href="css/fontawesome_relative_path.css">
</head>
<body>
<header>
<nav class="navbar navbar-dark bg-primary">
<a href="index.html" class="navbar-brand category-btn lht-0">
<i class="fas fa-chevron-left fs-12 p-1"></i>
<span class="d-none d-md-inline fs-10">
戻る
</span>
</a>
<div class="navbar-nav">
<div class="nav-item">
<div class="text-size btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-white btn-sm border size-button smaller"><i class="fas fa-minus"></i></button>
<button type="button" class="btn btn-white btn-sm border size-button defaulter"><i class="fas fa-font"></i></button>
<button type="button" class="btn btn-white btn-sm border size-button larger"><i class="fas fa-plus"></i></button>
</div>
</div>
</div>
</nav>
</header>
<div class="container-fluid mb-5">
<div class="row mx-lg-2">
<div class="col-12 col-lg-4 px-0">
<aside>
<nav class="side-navi mt-3 mt-lg-5">
<ul>
<li><a href="">報告1</a></li>
<li class="active"><a href="">長いタイトルの報告長いタイトルの報告長いタイトルの報告長いタイトルの報告長いタイトルの報告長いタイトルの報告長いタイトルの報告</a></li>
<li><a href="">報告2</a></li>
<li><a href="">報告3</a></li>
<li><a href="">報告4</a></li>
</ul>
</nav>
</aside>
</div>
<div class="col-12 col-lg-8">
<main>
<div class="row">
<div class="col-12 bg-lightblue mt-0 mt-lg-5 mb-1px">
<h4 class="accordion-title fs-12 py-2 m-0" data-toggle="collapse" href="#group1" role="button" aria-expanded="true" aria-controls="group1">
グループ 1/3
</h4>
<div class="bg-white mb-3 collapse show" id="group1">
<div class="p-3">
<div class="form-group mb-4">
<label for="workCode">作業コード <span class="badge badge-danger">必須</span></label>
<input type="workCode" class="form-control" id="workCode" aria-describedby="workCodeHelp">
<small id="workCodeHelp" class="form-text text-muted">入力できるのは全角半角問わず20文字以内です</small>
</div>
<div class="form-group mb-4">
<label for="datetimepicker1">入力日</label>
<div class="input-group date" id="datetimepicker1" data-target-input="nearest">
<input type="text" class="form-control datetimepicker-input" data-target="#datetimepicker1" aria-describedby="datetimepicker1Help">
<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>
<small id="datetimepicker1Help" class="form-text text-muted">
<i class="fas fa-file-alt fs-10 text-primary"></i>
<a href="" class="text-secondary">
マニュアル
</a>
</small>
</div>
<div class="form-group mb-4">
<label for="department">
部署 <span class="badge badge-danger">必須</span>
<i class="fas fa-question-circle text-secondary" data-toggle="tooltip" data-placement="top" title="ABookCheckの管理画面で登録した作業グループから選択します。作業グループが多い場合は検索窓にグループ名の一部を入力して選択肢を探すことができます。"></i>
</label>
<select class="form-control" id="department">
<option>部署を選択</option>
<option>…</option>
</select>
</div>
<div class="form-group">
<label for="name">名前 <span class="badge badge-danger">必須</span></label>
<input type="name" class="form-control" id="name" aria-describedby="nameHelp">
</div>
</div>
</div>
</div>
<div class="col-12 bg-lightblue mb-1px">
<h4 class="accordion-title fs-12 py-2 m-0 collapsed" data-toggle="collapse" href="#group2" role="button" aria-expanded="false" aria-controls="group2">
グループ 2/3
</h4>
<div class="bg-white mb-3 collapse" id="group2">
<div class="p-3">
form
</div>
</div>
</div>
<div class="col-12 bg-lightblue mb-1px">
<h4 class="accordion-title fs-12 py-2 m-0 collapsed" data-toggle="collapse" href="#group3" role="button" aria-expanded="false" aria-controls="group3">
グループ 3/3
</h4>
<div class="bg-white mb-3 collapse" id="group3">
<div class="p-3">
form
</div>
</div>
</div>
<div class="col-12 d-flex">
<div class="p-2 flex-grow-1">
</div>
<div class="p-2">
<button class="btn btn-outline-primary">保存</button>
</div>
<div class="p-2">
<button class="btn btn-outline-primary">送信</button>
</div>
</div>
</div>
</main>
</div>
</div>
<script type="text/javascript" src="js/app.js" defer></script>
</body>
</html>
\ No newline at end of file
app/script/check.js
......@@ -2848,19 +2848,39 @@ CHK.createOperationList = function(operationList, isSearched = false) {
}
switch(sortType) {
case CHK_CONSTANT.SORT_TYPE.NAME:
operationList.sort((a, b) => (a.operationName > b.operationName) ? 1 : -1);
operationList.sort(function(a,b) {
if (a.operationName > b.operationName) return 1;
if (a.operationName < b.operationName) return -1;
return 0;
});
break;
case CHK_CONSTANT.SORT_TYPE.START_DATE_DESC:
operationList.sort((a, b) => (setOperationDate(a.operationStartDate) < setOperationDate(b.operationStartDate)) ? 1 : -1);
operationList.sort(function(a,b) {
if (setOperationDate(a.operationStartDate) < setOperationDate(b.operationStartDate)) return 1;
if (setOperationDate(a.operationStartDate) > setOperationDate(b.operationStartDate)) return -1;
return 0;
});
break;
case CHK_CONSTANT.SORT_TYPE.START_DATE_ASC:
operationList.sort((a, b) => (setOperationDate(a.operationStartDate) > setOperationDate(b.operationStartDate)) ? 1 : -1);
operationList.sort(function(a,b) {
if (setOperationDate(a.operationStartDate) > setOperationDate(b.operationStartDate)) return 1;
if (setOperationDate(a.operationStartDate) < setOperationDate(b.operationStartDate)) return -1;
return 0;
});
break;
case CHK_CONSTANT.SORT_TYPE.TYPE:
operationList.sort((a, b) => (a.operationType < b.operationType) ? 1 : -1);
operationList.sort(function(a,b) {
if (a.operationType < b.operationType) return 1;
if (a.operationType > b.operationType) return -1;
return 0;
});
break;
case CHK_CONSTANT.SORT_TYPE.LAST_EDIT_DATE:
operationList.sort((a, b) => (a.lastEditDate < b.lastEditDate) ? 1 : -1);
operationList.sort(function(a,b) {
if (a.lastEditDate < b.lastEditDate) return 1;
if (a.lastEditDate > b.lastEditDate) return -1;
return 0;
});
break;
}
}
......@@ -2922,10 +2942,10 @@ CHK.search = function() {
result = result * operation.operationName.includes(searchKeyword);
}
if (searchStartDate.length) {
result = result * (operation.operationEndDate >= searchStartDate);
result = result * (operation.operationStartDate >= searchStartDate);
}
if (searchEndDate.length) {
result = result * (operation.operationStartDate <= searchEndDate);
result = result * (operation.operationEndDate <= searchEndDate);
}
if (operationGroupMasterId != 0) {
var operationGroupMasterIdList = CHK.operationGroupMasterRelation.operationGroupMasterRelationList.filter(function(operationGroupMasterRelation) {
......
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