Skip to content

A
abook_check
Commit 3780dde1 by NGUYEN HOANG SON
Options

CMD 'goOperation': add param: directPhaseNo

parent a5d42b9c
Showing with 10 additions and 0 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
...@@ -254,6 +254,7 @@ public class ABookKeys { ...@@ -254,6 +254,7 @@ public class ABookKeys {
public static final String DIRECT_PAGE = "directPage"; public static final String DIRECT_PAGE = "directPage";
public static final String BACK_PAGE = "backPage"; public static final String BACK_PAGE = "backPage";
public static final String DIRECT_TASK_KEY = "directTaskKey"; public static final String DIRECT_TASK_KEY = "directTaskKey";
public static final String DIRECT_PHASE_NO = "directPhaseNo";
} }
} }
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -161,6 +161,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -161,6 +161,7 @@ public class OperationListActivity extends ABVUIActivity {
private String directPage; private String directPage;
private String backPage; private String backPage;
private String directTaskKey; private String directTaskKey;
private String directPhaseNo;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -345,6 +346,11 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -345,6 +346,11 @@ public class OperationListActivity extends ABVUIActivity {
&& !jsonParam.isNull(ABookKeys.GO_OPERATION_KEY.DIRECT_TASK_KEY)) { && !jsonParam.isNull(ABookKeys.GO_OPERATION_KEY.DIRECT_TASK_KEY)) {
directTaskKey = jsonParam.getString(ABookKeys.GO_OPERATION_KEY.DIRECT_TASK_KEY); directTaskKey = jsonParam.getString(ABookKeys.GO_OPERATION_KEY.DIRECT_TASK_KEY);
} }
directPhaseNo = null;
if (jsonParam.has(ABookKeys.GO_OPERATION_KEY.DIRECT_PHASE_NO)
&& !jsonParam.isNull(ABookKeys.GO_OPERATION_KEY.DIRECT_PHASE_NO)) {
directPhaseNo = jsonParam.getString(ABookKeys.GO_OPERATION_KEY.DIRECT_PHASE_NO);
}
final OperationDto tempOperationDto = mOperationDao.getOperationJoinContent(jsonParam.getInt(ABookKeys.OPERATION_ID)); final OperationDto tempOperationDto = mOperationDao.getOperationJoinContent(jsonParam.getInt(ABookKeys.OPERATION_ID));
if (tempOperationDto.operationType == Constant.operationType.CONTENT360 if (tempOperationDto.operationType == Constant.operationType.CONTENT360
&& tempOperationDto.contentId == null) { && tempOperationDto.contentId == null) {
...@@ -914,6 +920,9 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -914,6 +920,9 @@ public class OperationListActivity extends ABVUIActivity {
if (directTaskKey != null && directTaskKey.length() > 0) { if (directTaskKey != null && directTaskKey.length() > 0) {
path.append("&directTaskKey=" + directTaskKey); path.append("&directTaskKey=" + directTaskKey);
} }
if (directPhaseNo != null && directPhaseNo.length() > 0) {
path.append("&directPhaseNo=" + directPhaseNo);
}
path.append("&acmsAddress=" + ABVEnvironment.getInstance().acmsAddress); path.append("&acmsAddress=" + ABVEnvironment.getInstance().acmsAddress);
if (mScanType != null) { if (mScanType != null) {
String scanTypeKey = null; String scanTypeKey = null;
......
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