Skip to content

C
check
Commit 7a24614a by NGO THI HONG
Options

include header, dashboard setting

parent fc0a3347
Showing with 69 additions and 114 deletions
abvw/common/header.html
...@@ -2,34 +2,34 @@ ...@@ -2,34 +2,34 @@
<nav class="navbar navbar-dark shadow-sm px-sm-auto px-0"> <nav class="navbar navbar-dark shadow-sm px-sm-auto px-0">
<div class="container"> <div class="container">
<a href="dashboard.html" class="navbar-brand"> <a href="dashboard.html" class="navbar-brand">
<img src="img/logo.svg" alt="ロゴ" class="img-fluid"> <img src="../common/img/logo.svg" alt="ロゴ" class="img-fluid">
</a> </a>
<ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex"> <ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex">
<li class="active nav-link"> <li class="active nav-link">
<a href="dashboard.html" class="d-block text-center text-decoration-none"> <a href="dashboard.html" class="d-block text-center text-decoration-none">
<img src="img/nav_icon_dashboard.svg" alt="ダッシュボード" class="p-sm-1 p-0 img-fluid"> <img src="../common/img/nav_icon_dashboard.svg" alt="ダッシュボード" class="p-sm-1 p-0 img-fluid">
<div class="fs-7 d-sm-block d-none">ダッシュボード</div> <div class="fs-7 d-sm-block d-none lang" lang="titleDashboard"></div>
</a> </a>
</li> </li>
<li class="nav-link"> <li class="nav-link">
<a href="task-list.html" class="d-block text-center text-decoration-none"> <a href="task-list.html" class="d-block text-center text-decoration-none">
<img src="img/nav_icon_task.svg" alt="作業一覧" class="p-sm-1 p-0 img-fluid"> <img src="../common/img/nav_icon_task.svg" alt="作業一覧" class="p-sm-1 p-0 img-fluid">
<div class="fs-7 d-sm-block d-none">作業一覧</div> <div class="fs-7 d-sm-block d-none">作業一覧</div>
</a> </a>
</li> </li>
</ul> </ul>
<div class="dropdown"> <div class="dropdown">
<a href="#" class="nav-link text-center" id="dropdown-profile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a href="#" class="nav-link text-center" id="dropdown-profile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="img/nav_icon_profile.svg" alt="プロフィール" class="p-sm-1 p-0 img-fluid profile-img"> <img src="../common/img/nav_icon_profile.svg" alt="プロフィール" class="p-sm-1 p-0 img-fluid profile-img">
<div class="fs-7 d-sm-block d-none">プロフィール</div> <div class="fs-7 d-sm-block d-none">プロフィール</div>
</a> </a>
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile"> <div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<h6 class="dropdown-header">login-id</h6> <h6 class="dropdown-header">login-id</h6>
<a class="dropdown-item" href="account-setting.html"> <a class="dropdown-item" href="account-setting.html">
<img src="./img/menu_icon_account_setting.svg" alt="アカウント設定" class="navbar-dropdown-icon"> <img src="../common/img/menu_icon_account_setting.svg" alt="アカウント設定" class="navbar-dropdown-icon">
アカウント設定</a> アカウント設定</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#confirm-modal"> <a class="dropdown-item" href="#" data-toggle="modal" data-target="#confirm-modal">
<img src="./img/menu_icon_logout.svg" alt="ログアウト" class="navbar-dropdown-icon"> <img src="../common/img/menu_icon_logout.svg" alt="ログアウト" class="navbar-dropdown-icon">
ログアウト</a> ログアウト</a>
</div> </div>
</div> </div>
......
abvw/html/dashboard-setting.html
<!DOCTYPE html> <!-- dashboard setting modal -->
<html lang="ja-JP"> <div class="modal fade" id="dashboard-setting-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-dialog-centered" role="document">
<head> <div class="modal-content">
<meta charset="utf-8"> <div class="modal-header bg-dark10">
<title>ダッシュボード設定</title> <h5 class="modal-title multi-lang" data-msg="dashboardSettingHeaderTitle">ダッシュボード設定</h5>
<meta name="robots" content="index, follow"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <span aria-hidden="true">&times;</span>
<meta name="description" content="A Book Check"> </button>
</div>
<link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/app.css"> <div class="modal-body">
<link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/fontawesome_relative_path.css"> <table class="w-100" id="dashboardSettingItems">
<link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/header.css"> <colgroup>
<link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/footer.css"> <col span="1" class="w-120px">
<link rel="stylesheet" type="text/css" href="/abvw/common/css/appCommon/style.css"> </colgroup>
<script src="/abvw/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script> <tbody>
<script src="/abvw/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script> <tr>
<script src="/abvw/common/js/constant.js?__UPDATEID__"></script> <th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingNewReportTitle">新規報告</th>
<script src="/abvw/common/js/common.js?__UPDATEID__"></script> <td class="p-2"><div id="settingNewReport" data-key="newReport" class="toggle ml-auto"><input type="checkbox" name="chk-new"></div></td>
<script src="/abvw/common/js/footer.js"></script> </tr>
<script src="/abvw/js/dashboardSetting/dashboard-setting.js"></script> <tr>
</head> <th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingContinousWorkTitle">工程作業</th>
<td class="p-2"><div id="settingContinousWork" data-key="continousWork" class="toggle ml-auto"><input type="checkbox" name="chk-proccess"></div></td>
<body id="dashboard" onload="DashboardSetting.init();"> </tr>
<header> <tr>
<nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100"> <th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingReportWarningTitle">警告を含む作業</th>
<a href="javascript:DashboardSetting.goBack();" class="navbar-brand category-btn lht-0"> <td class="p-2"><div id="settingReportWarning" data-key="reportWarning" class="toggle ml-auto"><input type="checkbox" name="chk-alert"></div></td>
<i class="fas fa-chevron-left fs-12 p-1"></i> </tr>
<span class="d-none d-md-inline fs-10"> <tr>
戻る <th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingDashboardHomeTitle">ダッシュボードをホーム画面にする</th>
</span> <td class="p-2"><div id="settingDashboardHome" data-key="dashboardHome" class="toggle ml-auto"><input type="checkbox" name="chk-home"></div></td>
</a> </tr>
<h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang" data-msg="dashboardSettingHeaderTitle">ダッシュボード設定</h1> </tbody>
<div></div> </table>
</nav> </div>
</header> <div class="modal-footer">
<button type="button" class="btn btn-primary multi-lang" data-msg="dashboardSettingSaveButton" onclick="DashboardSetting.onClickSave();">保存</button>
<!-- setting --> <button type="button" class="btn btn-tertiary multi-lang" data-msg="dashboardSettingCancelButton" data-dismiss="modal">キャンセル</button>
<section class="container-fluid main-section"> </div>
<main> </div>
<h2 class="fs-8 font-weight-bold mt-4 pb-2 border-bottom text-dark multi-lang" data-msg="dashboardSettingDisplayHeader">表示切替</h2> </div>
<div class="setting-table-wrap"> </div>
<table id="displayItems"> \ No newline at end of file
<tbody>
<!-- <tr>
<th><div class="font-weight-normal text-dark multi-lang" data-msg="dashboardSettingNewRegistrationTitle">新規報告</div></th>
<td>
<div class="toggle"><input type="checkbox" name="chk-new" /></div>
</td>
</tr> -->
</tbody>
</table>
</div>
</main>
</section>
<div id="footer"></div>
</body>
</html>
\ No newline at end of file
abvw/html/dashboard.html
...@@ -15,7 +15,9 @@ ...@@ -15,7 +15,9 @@
<!-- vender css --> <!-- vender css -->
<link rel="stylesheet" type="text/css" href="../common/css/newdash/fontawesome_relative_path.css"> <link rel="stylesheet" type="text/css" href="../common/css/newdash/fontawesome_relative_path.css">
<script src="../common/js/jquery/jquery-3.6.0.min.js"></script> <script type="text/javascript" src="/abvw/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abvw/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="/abvw/common/js/web/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="../common/js/newdash/app.js"></script> <script type="text/javascript" src="../common/js/newdash/app.js"></script>
<script type="text/javascript" src="../common/js/newdash/common.js"></script> <script type="text/javascript" src="../common/js/newdash/common.js"></script>
...@@ -24,13 +26,20 @@ ...@@ -24,13 +26,20 @@
<script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script>
$(function(){
$("#includedHeader").load("../common/header.html");
$("#includedDashboardSetting").load("dashboard-setting.html");
$("#includedConfirmModal").load("../common/confirm-modal.html");
});
</script>
</head> </head>
<body onload="DASHBOARD.init();"> <body onload="DASHBOARD.init();">
<!-- header --> <!-- header -->
<?php include('common/header.html');?> <!-- <?php include('common/header.html');?> -->
<div id="includedHeader"></div>
<!-- dashboard --> <!-- dashboard -->
<main> <main>
<div class="container"> <div class="container">
...@@ -43,7 +52,7 @@ ...@@ -43,7 +52,7 @@
</div> </div>
<!-- sub title --> <!-- sub title -->
<h2 class="fs-8 font-weight-bold" id="#pickupHeader">ピックアップ</h2> <h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup">ピックアップ</h2>
<!-- card --> <!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" > <ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" >
...@@ -58,52 +67,11 @@ ...@@ -58,52 +67,11 @@
</div> </div>
</main> </main>
<!-- dashboard setting modal --> <div id="includedDashboardSetting"></div>
<div class="modal fade" id="dashboard-setting-modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header bg-dark10">
<h5 class="modal-title multi-lang" data-msg="dashboardSettingHeaderTitle">ダッシュボード設定</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<table class="w-100" id="dashboardSettingItems">
<colgroup>
<col span="1" class="w-120px">
</colgroup>
<tbody>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingNewReportTitle">新規報告</th>
<td class="p-2"><div id="settingNewReport" data-key="newReport" class="toggle ml-auto"><input type="checkbox" name="chk-new"></div></td>
</tr>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingContinousWorkTitle">工程作業</th>
<td class="p-2"><div id="settingContinousWork" data-key="continousWork" class="toggle ml-auto"><input type="checkbox" name="chk-proccess"></div></td>
</tr>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingReportWarningTitle">警告を含む作業</th>
<td class="p-2"><div id="settingReportWarning" data-key="reportWarning" class="toggle ml-auto"><input type="checkbox" name="chk-alert"></div></td>
</tr>
<tr>
<th class="fs-9 p-2 text-secondary multi-lang" data-msg="dashboardSettingDashboardHomeTitle">ダッシュボードをホーム画面にする</th>
<td class="p-2"><div id="settingDashboardHome" data-key="dashboardHome" class="toggle ml-auto"><input type="checkbox" name="chk-home"></div></td>
</tr>
</tbody>
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary multi-lang" data-msg="dashboardSettingSaveButton" onclick="DashboardSetting.onClickSave();">保存</button>
<button type="button" class="btn btn-tertiary multi-lang" data-msg="dashboardSettingCancelButton" data-dismiss="modal">キャンセル</button>
</div>
</div>
</div>
</div>
<!-- confirm --> <!-- confirm -->
<?php include('common/confirm-modal.html');?> <!-- <?php include('common/confirm-modal.html');?> -->
<div id="includedConfirmModal"></div>
</body> </body>
</html> </html>
\ No newline at end of file
abvw/js/dashboard/dashboard.js
...@@ -101,6 +101,8 @@ DASHBOARD.initHtmlItem = function(item) { ...@@ -101,6 +101,8 @@ DASHBOARD.initHtmlItem = function(item) {
// Initialization dashboard screen // Initialization dashboard screen
DASHBOARD.init = function() { DASHBOARD.init = function() {
I18N.initi18n();
DashboardSetting.init();
DashboardSetting.getSettingData(function (settings) { DashboardSetting.getSettingData(function (settings) {
DASHBOARD.getDashboardData(function (dataDashboard) { DASHBOARD.getDashboardData(function (dataDashboard) {
DASHBOARD.updateDataPickups(settings, dataDashboard); DASHBOARD.updateDataPickups(settings, dataDashboard);
......
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