カテゴリー検索対応

ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java

@@ -91,6 +91,7 @@ public class ABookKeys {
         public static final String GO_COMMUNICATION = "goCommunication";
         public static final String GO_COMMUNICATION = "goCommunication";
         public static final String GO_PANORAMA_EDIT = "goPanoramaEdit";
         public static final String GO_PANORAMA_EDIT = "goPanoramaEdit";
         public static final String REFRESH_CONTENT = "refreshContent";
         public static final String REFRESH_CONTENT = "refreshContent";
+        public static final String CHANGE_OPERATION_GROUP_MASTER = "changeOperationGroupMaster";
     }
     }
 
 
 
 

check @ 50e2553c

-Subproject commit 773ca169e71c85c4ee45eebd3d1256197d458863
+Subproject commit 50e2553c744e549d2fbcfd683fd6b1dcf48d5434

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java

@@ -402,6 +402,12 @@ public class OperationListActivity extends ABVUIActivity {
                             }
                             }
                         });
                         });
                         break;
                         break;
+
+                    case ABookKeys.CMD_KEY.CHANGE_OPERATION_GROUP_MASTER:
+                        clearSearch();
+                        List<OperationDto>operationList = mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(jsonParam.getInt(ABookKeys.OPERATION_GROUPMASTER_ID), null);
+                        mOperationLogic.createOperationListJson(operationList, null);
+                        break;
                 }
                 }
             }
             }
         }
         }
@@ -412,11 +418,16 @@ public class OperationListActivity extends ABVUIActivity {
         }
         }
 
 
         @JavascriptInterface
         @JavascriptInterface
-        public String searchOperationList(String searchKeyword, String searchStartDate, String searchEndDate) {
+        public String searchOperationList(String searchKeyword, String searchStartDate, String searchEndDate, int operationGroupMasterId) {
             mSearchWord = searchKeyword;
             mSearchWord = searchKeyword;
             mStartDateStr = searchStartDate;
             mStartDateStr = searchStartDate;
             mEndDateStr = searchEndDate;
             mEndDateStr = searchEndDate;
-            List<OperationDto> operationList = mListHelper.filterOperationList();
+            List<OperationDto> operationList;
+            if (operationGroupMasterId != 0) {
+                operationList = mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(operationGroupMasterId, null);
+            } else {
+                operationList = mListHelper.filterOperationList();
+            }
             String searchOperationListStr = mOperationLogic.createOperationListJson(operationList, null);
             String searchOperationListStr = mOperationLogic.createOperationListJson(operationList, null);
             return searchOperationListStr;
             return searchOperationListStr;
         }
         }
@@ -1960,10 +1971,10 @@ public class OperationListActivity extends ABVUIActivity {
             setOperationListView();
             setOperationListView();
         }
         }
 
 
-        if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.CATEGORY) {
+        /*if (getABVUIDataCache().getOperationGroupMasterMode() == OperationLocationType.CATEGORY) {
             //作業種別モードの場合は、作業種別選択ダイアログ画面を表示
             //作業種別モードの場合は、作業種別選択ダイアログ画面を表示
             showOperationGroupMasterDialog(true);
             showOperationGroupMasterDialog(true);
-        }
+        }*/
     }
     }
 
 
     /**
     /**