Skip to content

D
design
Commit 1543b737 by NGO THI HONG
Options

#ticket 49113, 49114, 49115, 49118

parent 25d81d19
Showing with 117 additions and 25 deletions
app/index.html
......@@ -15,6 +15,7 @@
<link rel="stylesheet" type="text/css" href="css/style.css">
<script src="js/jquery-1.11.2.min.js?__UPDATEID__"></script>
<script src="script/check.js?__UPDATEID__"></script>
<script src="script/check_PU.js?__UPDATEID__"></script>
<script src="script/check-list.js?__UPDATEID__"></script>
<script src="script/check-foriOS.js"></script>
<script src="script/constant.js?__UPDATEID__"></script>
......@@ -22,29 +23,84 @@
<body onload="CHK_L.init();" style="position: relative; margin-top: 53px;">
<section id="operationList" class="page-content">
<section id="operationList" class="page-content" style="display: none;">
<header style="position: fixed; width: 100%; top: 0px; left: 0; z-index: 999;">
<nav class="navbar navbar-dark bg-primary">
<h1 class="fs-10 font-weight-bold mb-0 text-white"></h1>
<div class="d-flex align-items-center">
<a class="navbar-brand category-btn lht-0 d-none" onclick="CHK.openCategory();" id="operationGroupMasterButton" href="javascript:CHK.setCategoryHeight();">
<i class="fa fa-folder fs-12 p-1" id="category-toggle-button"></i>
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonCategory">カテゴリー</span>
</a>
<a class="navbar-brand lht-0" href="javascript:CHK_L.sendAppCommand('refreshContent');" style="margin: 0 10px 0 10px;float: right;">
<i class="fa fa-redo fs-12 p-1" id="updateButton"></i>
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonRefresh">更新</span>
<header >
<nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100">
<a onclick="clickBottomNav('dashboard', this);" 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 multi-lang" data-msg="buttonBack">
戻る
</span>
</a>
<a class="navbar-brand lht-0 d-none" id="rfidScanButton" href="javascript:CHK.startScan();" style="margin: 0 10px 0 10px;float: right;">
<img class="icon-lg" src="img/icon_scan.svg">
<span class="d-none d-md-inline fs-10 multi-lang" data-msg="buttonScan">スキャン</span>
<h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang" data-msg="labelPickUp">ピックアップ</h1>
<a href="javascript:CHK_L.sendAppCommand('refreshContent');" class="nav-link text-white lht-0 p-1">
<img class="icon" src="img/icon_update.svg" alt="更新">
<span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonRefresh">
更新
</span>
</a>
</div>
</nav>
</header>
<section class="category-menu">
<!-- tab -->
<section class="main-section">
<main>
<div class="tab-wrap">
<input id="tab-01" type="radio" name="tab-task" class="tab-switch">
<input id="tab-02" type="radio" name="tab-task" class="tab-switch" checked>
<input id="tab-03" type="radio" name="tab-task" class="tab-switch">
<ul class="tab-menu pl-0">
<li class="tab-label list-unstyled on"><label class="tab-label-01 fs-9 multi-lang" data-msg="labelNewReport" for="tab-01">新規報告<div class="task-cnt">10</div></label></li>
<li class="tab-label list-unstyled"><label class="tab-label-02 fs-9 multi-lang" data-msg="labelContinueWork" for="tab-02">工程作業<div class="task-cnt">99+</div></label></li>
<li class="tab-label list-unstyled"><label class="tab-label-03 fs- multi-lang" data-msg="labelReportWithWarning" for="tab-03">警告を含む報告<div class="task-cnt">10</div></label></li>
</ul>
<div class="tab-content-area">
<!-- 新規報告 -->
<div id="tab-content-01" class="tab-content on">
<div class="container-fluid">
<ul class="task-list p-0 mt-3" id="newReport-list">
<li class='item list-unstyled rounded border mb-2' name = 'operationId_x5489'>
<a href="#" class="d-block px-3 py-3 text-decoration-none text-dark">
<div class="title">作業名が入ります。</div>
<i class="fas fa-chevron-right fs-12"></i>
</a>
</li>
</ul>
</div>
</div>
<!-- 工程作業 -->
<div id="tab-content-02" class="tab-content">
<div class="container-fluid">
<ul class="task-list p-0 mt-3" id="continueWork-list">
</ul>
</div>
</div>
<!-- 警告を含む報告 -->
<div id="tab-content-03" class="tab-content">
<div class="container-fluid">
<ul class="task-list p-0 mt-3" id="reportWithWarning-list">
<li class="item list-unstyled rounded border mb-2">
<a href="#" class="d-block px-3 py-2 text-decoration-none text-dark">
<div class="tag fs-8 text-secondary px-2 py-1 mr-2 rounded border mb-1">工程名が入ります。</div>
<div class="title">作業名が入ります。</div>
<div class="sub-title-wrap">
<div class="fs-8 text-secondary mr-2"><div class="data">code-9999</div></div>
<div class="sub-title">報告名が入ります。</div>
</div>
<i class="fas fa-chevron-right fs-12"></i>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</main>
</section>
<section class="category-menu" hidden>
<div id="overlayDiv" class="overlay"></div>
<nav id="category-menu" class="drawer-menu">
<div class="d-flex justify-content-between border-bottom">
......@@ -53,17 +109,16 @@
</div>
</nav>
</section>
<section class="container-fluid main-section">
<section class="container-fluid main-section" hidden>
<main>
<nav aria-label="breadcrumb">
<nav aria-label="breadcrumb" hidden>
<ol class="breadcrumb border-bottom px-0" id="groupMasterPath">
</ol>
</nav>
<nav aria-label="search">
<nav aria-label="search" hidden>
<div class="row">
<div class="col-7 col-md-5 col-lg-4">
<div class="form-group has-search input-group">
......@@ -133,7 +188,7 @@
</nav>
<section>
<section hidden>
<table class="table">
<thead>
<tr>
......@@ -153,7 +208,7 @@
</section>
</section>
<section id="dashboard" class="page-content" style="display: none;">
<section id="dashboard" class="page-content" >
<header>
<nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100">
<div></div>
......@@ -238,11 +293,11 @@
<footer class="fixed-bottom bg-light">
<nav class="d-flex justify-content-around">
<a class="d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav" onclick="clickBottomNav('dashboard', this);">
<a class="d-block w-100 text-center py-2 text-decoration-none text-primary bottom-nav" onclick="clickBottomNav('dashboard', this);">
<img src="img/icon_dashboard_inactive.svg" data-inactive-src="img/icon_dashboard_inactive.svg" data-src="img/icon_dashboard.svg" alt="ダッシュボード" class="p-1">
<div class="fs-7 multi-lang" data-msg="buttonDashboard">ダッシュボード</div>
</a>
<a class="d-block w-100 text-center py-2 text-decoration-none text-primary bottom-nav" onclick="clickBottomNav('operationList', this);">
<a class="d-block w-100 text-center py-2 text-decoration-none text-secondary bottom-nav" onclick="clickBottomNav('operationList', this);">
<i class="fas fa-tasks fs-14 p-1"></i>
<div class="fs-7 multi-lang" data-msg="buttonOperationList">作業一覧</div>
</a>
......@@ -265,6 +320,9 @@
</nav>
</footer>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="js/app.js"></script>
<script type="text/javascript" src="js/common.js"></script>
<div class="scan-overlay d-none"></div>
<div class="alert-overlay d-none"></div>
<div class="scan-area d-none">
......
app/js/common.js 0 → 100644
// トグル切り替え
$(".toggle").on("click", function() {
$(this).toggleClass("checked");
if(!$('input[name="check"]').prop("checked")) {
$(".toggle input").prop("checked", true);
} else {
$(".toggle input").prop("checked", false);
}
});
// タブ切り替え
$('.tab-wrap .tab-label').on('click', function () {
var tab_index = $(this).parent().find('.tab-label').index(this);
$(this).parent().parent().find('.tab-label, .tab-content').removeClass('on');
$(this).parent().parent().find('.tab-label').eq(tab_index).addClass('on');
$(this).parent().parent().find('.tab-content').eq(tab_index).addClass('on');
});
$(function(){
var myTarget = $(".tab-label.on");
var myIndex = $(".tab-wrap .tab-label").index(myTarget);
var scrollvalue = 130 * myIndex;
$('.tab-menu').scrollLeft(scrollvalue);
});
\ No newline at end of file
app/operationList.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app/script/check.js
......@@ -68,6 +68,7 @@ var msgMap = { // velocity?
buttonCategory: { ja: "カテゴリー", ko: "카테고리", en: "Category" },
buttonRefresh: { ja: "更新", ko: "갱신", en: "Refresh" },
buttonBack: { ja: "戻る", ko: "Back", en: "Back" },
buttonScan: { ja: "スキャン", ko: "스캔", en: "Scan" },
placeholderOperationName: { ja: "作業名", ko: "작업명", en: "Working Name" },
labelPeriod: { ja: "期間", ko: "기간", en: "Period" },
......@@ -102,6 +103,10 @@ var msgMap = { // velocity?
sendMessageTitle: { ja: "メッセージ送信", ko: "Send Message", en: "Send Message" },
distanceSupportTitle: { ja: "遠隔支援", ko: "Distance Support", en: "Distance Support" },
chatTitle: { ja: "チャット", ko: "Chat", en: "Chat" },
labelPickUp: { ja: "ピックアップ", ko: "Pick up", en: "Pick up" },
labelNewReport: { ja: "新規報告", ko: "New report", en: "New report" },
labelContinueWork: { ja: "工程作業", ko: "Process work", en: "Process work" },
labelReportWithWarning: { ja: "警告を含む報告", ko: "Reports with warnings", en: "Reports with warnings" }
};
// 言語取得
......@@ -490,6 +495,8 @@ CHK.initOperationList = function() {
CHK.operation.searchOperationList = json.operationList;
//作業一覧描画
CHK.createOperationList(CHK.operation.operationList);
CHK_pu.createNewReportList(CHK.operation.operationList);
CHK_pu.createContinueWorkList(CHK.operation.operationList);
});
}
......@@ -2916,6 +2923,7 @@ CHK.changeSortType = function(sortType) {
* 作業一覧描画
*/
CHK.createOperationList = function(operationList, isSearched = false) {
//alert("hongnt CHK.createOperationList ");
var searchKeyword = $("#searchTaskName").val();
var searchStartDate = $("#searchStartDate").val();
var searchEndDate = $("#searchEndDate").val();
......@@ -3113,6 +3121,7 @@ CHK.search = function() {
CHK.isSearched = true;
CHK.operation.searchOperationList = searchResult;
CHK.createOperationList(searchResult, CHK.isSearched);
CHK_PU.createOperationList(searchResult, CHK.isSearched);
};
/**
......
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