Skip to content

A
abook_check
Commit 64055de8 by Lee Munkyeong
Options

operationOpenDate追加及びメッセージ修正

parent ad877e2d
Showing with 11 additions and 1 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
...@@ -20,6 +20,7 @@ public class ABookKeys { ...@@ -20,6 +20,7 @@ public class ABookKeys {
public static final String OPERATION_TYPE = "operationType"; public static final String OPERATION_TYPE = "operationType";
public static final String OPERATION_START_DATE = "operationStartDate"; public static final String OPERATION_START_DATE = "operationStartDate";
public static final String OPERATION_END_DATE = "operationEndDate"; public static final String OPERATION_END_DATE = "operationEndDate";
public static final String OPERATION_OPEN_DATE = "operationOpenDate";
public static final String LAST_EDIT_DATE = "lastEditDate"; public static final String LAST_EDIT_DATE = "lastEditDate";
public static final String NEED_SYNC_FLG = "needSyncFlg"; public static final String NEED_SYNC_FLG = "needSyncFlg";
public static final String REPORT_TYPE = "reportType"; public static final String REPORT_TYPE = "reportType";
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
...@@ -45,6 +45,10 @@ public class OperationDao extends AbstractDao { ...@@ -45,6 +45,10 @@ public class OperationDao extends AbstractDao {
if (column != -1) { if (column != -1) {
dto.operationEndDate = DateTimeUtil.toDate(cursor.getString(column), "UTC", DateTimeFormat.yyyyMMdd_hyphen); dto.operationEndDate = DateTimeUtil.toDate(cursor.getString(column), "UTC", DateTimeFormat.yyyyMMdd_hyphen);
} }
column = cursor.getColumnIndex("operation_open_date");
if (column != -1) {
dto.operationOpenDate = DateTimeUtil.toDate(cursor.getString(column), "UTC", DateTimeFormat.yyyyMMddHHmmss_hyphen);
}
column = cursor.getColumnIndex("operation_type"); column = cursor.getColumnIndex("operation_type");
if (column != -1) { if (column != -1) {
dto.operationType = cursor.getInt(column); dto.operationType = cursor.getInt(column);
...@@ -322,6 +326,7 @@ public class OperationDao extends AbstractDao { ...@@ -322,6 +326,7 @@ public class OperationDao extends AbstractDao {
sql.append(" top.operation_descriptions, "); sql.append(" top.operation_descriptions, ");
sql.append(" top.operation_start_date, "); sql.append(" top.operation_start_date, ");
sql.append(" top.operation_end_date, "); sql.append(" top.operation_end_date, ");
sql.append(" top.operation_open_date, ");
sql.append(" top.last_edit_date, "); sql.append(" top.last_edit_date, ");
sql.append(" top.edit_lock_flg, "); sql.append(" top.edit_lock_flg, ");
sql.append(" top.need_sync_flg, "); sql.append(" top.need_sync_flg, ");
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/OperationDto.java
...@@ -15,6 +15,7 @@ public class OperationDto extends AbstractDto { ...@@ -15,6 +15,7 @@ public class OperationDto extends AbstractDto {
public String operationDescriptions; public String operationDescriptions;
public Date operationStartDate; public Date operationStartDate;
public Date operationEndDate; public Date operationEndDate;
public Date operationOpenDate;
public Date lastEditDate; public Date lastEditDate;
public boolean editLockFlg; public boolean editLockFlg;
public boolean needSyncFlg; public boolean needSyncFlg;
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
...@@ -2021,6 +2021,7 @@ public class OperationLogic extends AbstractLogic { ...@@ -2021,6 +2021,7 @@ public class OperationLogic extends AbstractLogic {
operationJson.put(ABookKeys.QUICK_REPORT, operationList.get(i).quickReport); operationJson.put(ABookKeys.QUICK_REPORT, operationList.get(i).quickReport);
operationJson.put(ABookKeys.PERMIT_CODE, operationList.get(i).permitCode); operationJson.put(ABookKeys.PERMIT_CODE, operationList.get(i).permitCode);
operationJson.put(ABookKeys.PERMIT_CODE_REQUIRED_FLG, operationList.get(i).permitCodeRequiredFlg); operationJson.put(ABookKeys.PERMIT_CODE_REQUIRED_FLG, operationList.get(i).permitCodeRequiredFlg);
operationJson.put(ABookKeys.OPERATION_OPEN_DATE, DateTimeUtil.toString(operationList.get(i).operationOpenDate, DateTimeFormat.yyyyMMddHHmmss_hyphen));
operationJson.put(ABookKeys.DISPLAY_PERMISSION_FLG, operationList.get(i).displayPermissionFlg); operationJson.put(ABookKeys.DISPLAY_PERMISSION_FLG, operationList.get(i).displayPermissionFlg);
operationJson.put(ABookKeys.CONTENT_ID, operationList.get(i).contentId); operationJson.put(ABookKeys.CONTENT_ID, operationList.get(i).contentId);
operationJsonArray.put(operationJson); operationJsonArray.put(operationJson);
......
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -238,6 +238,7 @@ ...@@ -238,6 +238,7 @@
<string name="L122">現在、この機能はAndroid版アプリでは\n対応しておりません。</string> <string name="L122">現在、この機能はAndroid版アプリでは\n対応しておりません。</string>
<string name="L123">この資料の表示は制限されています。\nパスワードの入力が必要です。</string> <string name="L123">この資料の表示は制限されています。\nパスワードの入力が必要です。</string>
<string name="L124">システムエラーが発生しました。アプリをリロードします。</string> <string name="L124">システムエラーが発生しました。アプリをリロードします。</string>
<string name="L125">その資料は非公開または削除されました。資料更新を行って下さい。</string>
<string name="C_E_SYSTEM_0001">予期せぬ問題が発生しました。</string> <string name="C_E_SYSTEM_0001">予期せぬ問題が発生しました。</string>
<string name="C_E_SYSTEM_0002">ログインできませんでした。（暗号化失敗 0002）</string> <string name="C_E_SYSTEM_0002">ログインできませんでした。（暗号化失敗 0002）</string>
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml
...@@ -239,6 +239,7 @@ ...@@ -239,6 +239,7 @@
<string name="L122">현재 이 기능은 Android 버전 앱에서 \n 대응하고 있지 않습니다.</string> <string name="L122">현재 이 기능은 Android 버전 앱에서 \n 대응하고 있지 않습니다.</string>
<string name="L123">표시가 제한된 컨텐츠 입니다.\n로그인 패스워드를 입력해 주세요.</string> <string name="L123">표시가 제한된 컨텐츠 입니다.\n로그인 패스워드를 입력해 주세요.</string>
<string name="L124">시스템에러가 발생하였습니다.앱을 리로드합니다.</string> <string name="L124">시스템에러가 발생하였습니다.앱을 리로드합니다.</string>
<string name="L125">이 컨텐츠는비공개 또는 삭제되었습니다.컨텐츠를 새로고침 해주세요.</string>
<string name="C_E_SYSTEM_0001">예기치 않은 오류가 발생하였습니다.</string> <string name="C_E_SYSTEM_0001">예기치 않은 오류가 발생하였습니다.</string>
<string name="C_E_SYSTEM_0002">로그인 할 수 없습니다.(암호화 실패 0002)</string> <string name="C_E_SYSTEM_0002">로그인 할 수 없습니다.(암호화 실패 0002)</string>
......
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
<string name="L122">Currently, this feature is not supported in the version of the App Android.</string> <string name="L122">Currently, this feature is not supported in the version of the App Android.</string>
<string name="L123">These content are limited.\nThe input of the password is necessary.</string> <string name="L123">These content are limited.\nThe input of the password is necessary.</string>
<string name="L124">System error occurred. Will reload the application.</string> <string name="L124">System error occurred. Will reload the application.</string>
<string name="L125">The contents was closed or deleted.Please update the contents.</string>
<string name="C_E_SYSTEM_0001">Contingency has occurred.</string> <string name="C_E_SYSTEM_0001">Contingency has occurred.</string>
<string name="C_E_SYSTEM_0002">App can not login.(Encryption failures 0002)</string> <string name="C_E_SYSTEM_0002">App can not login.(Encryption failures 0002)</string>
<string name="C_E_SYSTEM_0003">App can not login.(Library initialization Failed)</string> <string name="C_E_SYSTEM_0003">App can not login.(Library initialization Failed)</string>
......
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