検索対応

app/script/check.js

@@ -372,10 +372,11 @@ CHK.initReport = function(callback) {
 CHK.initReportApp = function (callback) {
 CHK.initReportApp = function (callback) {
     // 作業一覧JSONデータ
     // 作業一覧JSONデータ
     CHK.loadJson(CHK.jsonPath.operationList, function (json) {
     CHK.loadJson(CHK.jsonPath.operationList, function (json) {
+		CHK.operation = json;
         if (CHK.isAndroid) {
         if (CHK.isAndroid) {
     	    $('#operationTable').empty();
     	    $('#operationTable').empty();
+    	    CHK.operation.searchOperationList = json.operationList;
     	}
     	}
-		CHK.operation = json;
 		//作業一覧描画
 		//作業一覧描画
 		CHK.createOperationList(CHK.operation.operationList);
 		CHK.createOperationList(CHK.operation.operationList);
     });
     });
@@ -2734,9 +2735,9 @@ CHK.createCategory = function(operationGroupMasterList) {
 /**
 /**
  * 作業一覧描画
  * 作業一覧描画
  */
  */
-CHK.createOperationList = function(operationList) {
+CHK.createOperationList = function(operationList, isSearched = false) {
     $('#operationTable').empty();
     $('#operationTable').empty();
-    if (CHK.isSearched) {
+    if (isSearched) {
         operationList = CHK.operation.searchOperationList;
         operationList = CHK.operation.searchOperationList;
     }
     }
     if (operationList.length > 1) {
     if (operationList.length > 1) {
@@ -2807,14 +2808,13 @@ CHK.search = function() {
     var searchResult;
     var searchResult;
     if (CHK.isAndroid) {
     if (CHK.isAndroid) {
       searchResult = JSON.parse(android.searchOperationList(searchKeyword, searchStartDate, searchEndDate));
       searchResult = JSON.parse(android.searchOperationList(searchKeyword, searchStartDate, searchEndDate));
-      CHK.isSearched = true;
       CHK.operation.searchOperationList = searchResult.operationList;
       CHK.operation.searchOperationList = searchResult.operationList;
-      CHK.createOperationList(searchResult.operationList);
+      CHK.createOperationList(searchResult.operationList, true);
     }
     }
 };
 };
 
 
 CHK.changeSortType = function(sortType) {
 CHK.changeSortType = function(sortType) {
   $(".sort-type").removeClass("active");
   $(".sort-type").removeClass("active");
   $(sortType).addClass("active");
   $(sortType).addClass("active");
-  CHK.createOperationList(CHK.operation.operationList);
+  CHK.createOperationList(CHK.operation.operationList, true);
 }
 }
\ No newline at end of file