Skip to content

D
design
Commit afcf3947 by Lee Munkyeong
Options

検索機能実装

parent 49cc7d88
Showing with 39 additions and 30 deletions
app/index.html
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
<nav aria-label="search"> <nav aria-label="search">
<div class="row"> <div class="row">
<div class="col-7 col-md-5 col-lg-4"> <div class="col-7 col-md-5 col-lg-4">
<div class="form-group has-search input-group">
<div class="form-group has-search"> <input type="text" class="form-control" placeholder="作業名" id="searchTaskName">
<i class="fas fa-search form-control-feedback"></i> <div class="input-group-append">
<input type="text" class="form-control" placeholder="作業名"> <i class="fas fa-search input-group-text" onclick="CHK.search();"></i>
</div>
</div> </div>
</div> </div>
<div class="col-1 col-md-2 duration-area"> <div class="col-1 col-md-2 duration-area">
...@@ -70,34 +70,29 @@ ...@@ -70,34 +70,29 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-body"> <div class="modal-body">
<div class="form-group">
<div class="form-group"> <label>開始日</label>
<label>開始日</label> <div class="input-group date" id="datetimepicker1" data-target-input="nearest">
<div class="input-group date" id="datetimepicker1" data-target-input="nearest"> <input type="text" name="start" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker1" placeholder="選択" inputmode="none" id="searchStartDate">
<input type="text" name="start" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker1" placeholder="選択" inputmode="none"> <div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker">
<div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker"> <div class="input-group-text"><i class="far fa-calendar"></i></div>
<div class="input-group-text"><i class="far fa-calendar"></i></div> </div>
</div> </div>
</div> </div>
</div> <div class="form-group">
<label>終了日</label>
<div class="form-group"> <div class="input-group date" id="datetimepicker2" data-target-input="nearest">
<label>終了日</label> <input type="text" name="end" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" placeholder="選択" inputmode="none" id="searchEndDate">
<div class="input-group date" id="datetimepicker2" data-target-input="nearest"> <div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
<input type="text" name="end" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" placeholder="選択" inputmode="none"> <div class="input-group-text"><i class="far fa-calendar"></i></div>
<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker"> </div>
<div class="input-group-text"><i class="far fa-calendar"></i></div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-4 col-md-5 col-lg-6 text-right"> <div class="col-4 col-md-5 col-lg-6 text-right">
<a href="#" class="text-decoration-none py-2 lht-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-120, 0"> <a href="#" class="text-decoration-none py-2 lht-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-120, 0">
<i class="fa fa-sort text-dark"></i> <i class="fa fa-sort text-dark"></i>
...@@ -111,7 +106,6 @@ ...@@ -111,7 +106,6 @@
<a class="dropdown-item active" href="#">作業期間が古い順</a> <a class="dropdown-item active" href="#">作業期間が古い順</a>
<a class="dropdown-item" href="#">閲覧日が新しい順</a> <a class="dropdown-item" href="#">閲覧日が新しい順</a>
</div> </div>
<a href="javascript:CHK_L.sendAppCommand('refreshContent');" class="text-decoration-none py-2 lht-0 d-inline-block ml-3"> <a href="javascript:CHK_L.sendAppCommand('refreshContent');" class="text-decoration-none py-2 lht-0 d-inline-block ml-3">
<i class="fa fa-redo text-dark"></i> <i class="fa fa-redo text-dark"></i>
<span class="d-none d-md-inline text-dark fs-10"> <span class="d-none d-md-inline text-dark fs-10">
...@@ -119,7 +113,6 @@ ...@@ -119,7 +113,6 @@
</span> </span>
</a> </a>
</div> </div>
</div> </div>
</nav> </nav>
......
app/script/check.js
...@@ -2766,4 +2766,19 @@ CHK.createOperationList = function(operationList) { ...@@ -2766,4 +2766,19 @@ CHK.createOperationList = function(operationList) {
function setOperationDate(date){ function setOperationDate(date){
var operationDate = date.replace(/-/g, "/").substring(0,10); var operationDate = date.replace(/-/g, "/").substring(0,10);
return operationDate; return operationDate;
};
/**
* 作業一覧検索
*/
CHK.search = function() {
var searchKeyword = $("#searchTaskName").val();
var searchStartDate = $("#searchStartDate").val();
var searchEndDate = $("#searchEndDate").val();
var searchResult;
if (CHK.isAndroid) {
searchResult = JSON.parse(android.searchOperationList(searchKeyword, searchStartDate, searchEndDate));
$('#operationTable').empty();
CHK.createOperationList(searchResult.operationList);
}
}; };
\ No newline at end of file
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