Merge branch 'feature/1.4.0_miura' into 'feature/1.4.0'

Feature/1.4.0 miura

See merge request !2

app/script/check-foriOS.js

@@ -46,4 +46,19 @@ CHK_iOS.getPushMessageListJson = function () {
 		callNativeApp(NATIVE_KEY_IOS.getPushMessageListJson, {})
 		callNativeApp(NATIVE_KEY_IOS.getPushMessageListJson, {})
 	);
 	);
 };
 };
+
+CHK_iOS.searchOperationList = function (searchKeyword, searchStartDate, searchEndDate, operationGroupMasterId) {
+	return JSON.parse(
+		callNativeApp(NATIVE_KEY_IOS.searchOperationList, {
+			operationName: searchKeyword,
+			operationStartDate: searchStartDate,
+			operationEndDate: searchEndDate,
+			operationGroupMasterId: operationGroupMasterId
+		})
+	);
+};
+
+CHK_iOS.getSortType = function () {
+	return parseInt(callNativeApp(NATIVE_KEY_IOS.getSortType, {}));
+}
   
   
\ No newline at end of file

app/script/check.js

@@ -174,7 +174,9 @@ const NATIVE_KEY_IOS = {
 	getOperationListJson: "getOperationListJson",
 	getOperationListJson: "getOperationListJson",
 	getOperationGroupMasterListJson: "getOperationGroupMasterListJson",
 	getOperationGroupMasterListJson: "getOperationGroupMasterListJson",
 	getOperationGroupMasterRelationListJson: "getOperationGroupMasterRelationListJson",
 	getOperationGroupMasterRelationListJson: "getOperationGroupMasterRelationListJson",
-	getPushMessageListJson: "getPushMessageListJson"
+	getPushMessageListJson: "getPushMessageListJson",
+	searchOperationList: "searchOperationList",
+	getSortType: "getSortType"
 };
 };
 // レポートファイル保存タイプ
 // レポートファイル保存タイプ
 CHK.REPORT_SAVE_TYPE = {
 CHK.REPORT_SAVE_TYPE = {
@@ -2741,8 +2743,8 @@ CHK.showWhiteFrame = function() {
  */
  */
 CHK.createCategory = function(operationGroupMasterList) {
 CHK.createCategory = function(operationGroupMasterList) {
 
 
-    if (CHK.isAndroid) {
-        $(".group-category-list").remove();
+    if (CHK.isAndroid || CHK.isIOS) {
+        $('.group-category-list').remove();
         $("#groupMasterPath").empty();
         $("#groupMasterPath").empty();
         if (typeof CHK.operationGroupMasterId == 'undefined' || CHK.operationGroupMasterId == 0) {
         if (typeof CHK.operationGroupMasterId == 'undefined' || CHK.operationGroupMasterId == 0) {
             $("#groupMasterPath").append('<li class="breadcrumb-item"><a href="#" class="text-decoration-none text-dark">' + getMsg("all") + '</a></li>');
             $("#groupMasterPath").append('<li class="breadcrumb-item"><a href="#" class="text-decoration-none text-dark">' + getMsg("all") + '</a></li>');
@@ -2794,6 +2796,26 @@ CHK.createCategory = function(operationGroupMasterList) {
 };
 };
 
 
 /**
 /**
+ * 保存したsortTypeから作業一覧を描画
+ */
+ CHK.createOperationListBySavedSortType = function() {
+	let sortIndex = CHK_CONSTANT.SORT_TYPE.START_DATE_ASC;
+	if (CHK.isIOS) {
+		sortIndex = CHK_iOS.getSortType();
+	} else if (CHK.isAndroid) {
+		// TODO: 端末に保存したsortTypeを取得
+	}
+	let sortType = document.getElementsByClassName("sort-type")[sortIndex];
+	CHK.changeSortType(sortType);
+}
+
+CHK.changeSortType = function(sortType) {
+	$(".sort-type").removeClass("active");
+	$(sortType).addClass("active");
+	CHK.createOperationList(CHK.operation.operationList, true);
+}
+
+/**
  * 作業一覧描画
  * 作業一覧描画
  */
  */
 CHK.createOperationList = function(operationList, isSearched = false) {
 CHK.createOperationList = function(operationList, isSearched = false) {
@@ -2803,6 +2825,13 @@ CHK.createOperationList = function(operationList, isSearched = false) {
     }
     }
     if (operationList.length > 1) {
     if (operationList.length > 1) {
         var sortType = $(".sort-type.active").data("sort");
         var sortType = $(".sort-type.active").data("sort");
+		if (isSearched) {
+			if (CHK.isIOS) {
+				webkit.messageHandlers.saveSortType.postMessage(sortType);
+			} else if (CHK.isAndroid) {
+				// TODO: sortTypeを端末に保存
+			}
+		}
         switch(sortType) {
         switch(sortType) {
             case CHK_CONSTANT.SORT_TYPE.NAME:
             case CHK_CONSTANT.SORT_TYPE.NAME:
                 console.log(sortType);
                 console.log(sortType);
@@ -2881,13 +2910,27 @@ CHK.search = function() {
         CHK.isSearched = true;
         CHK.isSearched = true;
         CHK.operation.searchOperationList = searchResult.operationList;
         CHK.operation.searchOperationList = searchResult.operationList;
         CHK.createOperationList(searchResult.operationList);
         CHK.createOperationList(searchResult.operationList);
-    }
+		// TODO: カテゴリの保存
+    } else if (CHK.isIOS) {
+		searchResult = CHK_iOS.searchOperationList(searchKeyword, searchStartDate, searchEndDate, CHK.operationGroupMasterId);
+		CHK.isSearched = true;
+        CHK.operation.searchOperationList = searchResult.operationList;
+        CHK.createOperationList(searchResult.operationList);
+		webkit.messageHandlers.saveOperationGroupMaster.postMessage(CHK.operationGroupMasterId);
+		let searchButtonTaped = searchKeyword != "" || searchStartDate != "" || searchEndDate != "";
+		if (searchButtonTaped) {
+			webkit.messageHandlers.showSearchResultToast.postMessage(searchResult.operationList.length);
+		}
+	}
 };
 };
 
 
-CHK.changeSortType = function(sortType) {
-  $(".sort-type").removeClass("active");
-  $(sortType).addClass("active");
-  CHK.createOperationList(CHK.operation.operationList, true);
+/**
+ * 検索条件をセット
+ */
+CHK.setSearchInfo = function(taskName, startDate, endDate) {
+	$("#searchTaskName").val(taskName);
+	$("#searchStartDate").val(startDate);
+	$("#searchEndDate").val(endDate);
 }
 }
 
 
 // カテゴリーのドロワーメニュー開閉
 // カテゴリーのドロワーメニュー開閉