Commit f68b6370 by Takatoshi Miura

1.4.0_miura_iOSの検索機能を実装

parent a23e94f1
...@@ -47,3 +47,14 @@ CHK_iOS.getPushMessageListJson = function () { ...@@ -47,3 +47,14 @@ CHK_iOS.getPushMessageListJson = function () {
); );
}; };
CHK_iOS.searchOperationList = function (searchKeyword, searchStartDate, searchEndDate, operationGroupMasterId) {
return JSON.parse(
callNativeApp(NATIVE_KEY_IOS.searchOperationList, {
operationName: searchKeyword,
operationStartDate: searchStartDate,
operationEndDate: searchEndDate,
operationGroupMasterId: operationGroupMasterId
})
);
};
\ No newline at end of file
...@@ -172,7 +172,8 @@ const NATIVE_KEY_IOS = { ...@@ -172,7 +172,8 @@ const NATIVE_KEY_IOS = {
getOperationListJson: "getOperationListJson", getOperationListJson: "getOperationListJson",
getOperationGroupMasterListJson: "getOperationGroupMasterListJson", getOperationGroupMasterListJson: "getOperationGroupMasterListJson",
getOperationGroupMasterRelationListJson: "getOperationGroupMasterRelationListJson", getOperationGroupMasterRelationListJson: "getOperationGroupMasterRelationListJson",
getPushMessageListJson: "getPushMessageListJson" getPushMessageListJson: "getPushMessageListJson",
searchOperationList: "searchOperationList"
}; };
// レポートファイル保存タイプ // レポートファイル保存タイプ
CHK.REPORT_SAVE_TYPE = { CHK.REPORT_SAVE_TYPE = {
...@@ -2738,7 +2739,7 @@ CHK.showWhiteFrame = function() { ...@@ -2738,7 +2739,7 @@ CHK.showWhiteFrame = function() {
*/ */
CHK.createCategory = function(operationGroupMasterList) { CHK.createCategory = function(operationGroupMasterList) {
if (CHK.isAndroid) { if (CHK.isAndroid || CHK.isIOS) {
$('.group-category-list').remove(); $('.group-category-list').remove();
$("#groupMasterPath").empty(); $("#groupMasterPath").empty();
if (typeof CHK.operationGroupMasterId == 'undefined' || CHK.operationGroupMasterId == 0) { if (typeof CHK.operationGroupMasterId == 'undefined' || CHK.operationGroupMasterId == 0) {
...@@ -2855,6 +2856,11 @@ CHK.search = function() { ...@@ -2855,6 +2856,11 @@ 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);
} 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);
} }
}; };
......
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