Merge branch 'feature/contract/sato/1.0.300_51898_look3' into 'contract/sato/1.0.300'

I/O帳票のボタンの配置変更と英語でのタイトルを修正

See merge request !281

ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/UnlockReportParameters.java

@@ -24,7 +24,7 @@ public class UnlockReportParameters extends AcmsParameters {
 
         this.taskKey = taskKey;
         this.taskReportId = taskReportId;
-        this.reportStartDate = DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC");
+        this.reportStartDate = DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC");
     }
 
     public String getTaskKey() {

ABVJE_Res_Default_Android/res/values/strings.xml

@@ -1447,7 +1447,7 @@
     <!-- カテゴリ選択機能 -->
     <string name="no_child">No more data below.</string>
     <string name="title_category">Category</string>
-    <string name="title_all_operation">All</string>
+    <string name="title_all_operation">Operation List</string>
     <string name="category_list">Select Category</string>
     <string name="title_quick_report_output">Report confirmation</string>
     <!-- 一括同期機能 -->

ABVJE_UI_Android/res/layout/ac_html_webview.xml

@@ -179,17 +179,6 @@
                 android:background="@drawable/ic_operation_task_list"
                 android:layout_marginRight="10dp"
                 android:visibility="gone" />
-            <ImageButton
-                android:id="@+id/btn_print"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_centerInParent="true"
-                android:layout_toLeftOf="@+id/btn_help"
-                android:background="@drawable/btn_operation_print_white"
-                android:scaleX="0.6"
-                android:scaleY="0.6"
-                android:visibility="gone" />
 
             <ImageButton
                 android:id="@+id/btn_help"
@@ -200,6 +189,14 @@
                 android:layout_marginRight="10dp"
                 android:visibility="gone"
                 android:onClick="onClickShowHelpView"/>
+            <ImageButton
+                android:id="@+id/btn_print"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/btn_operation_print_white"
+                android:scaleX="0.6"
+                android:scaleY="0.6"
+                android:visibility="gone" />
         </LinearLayout>
 
     </RelativeLayout>

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -1003,7 +1003,11 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 								afterABookCheckApi(mCmd, mTaskKey, 0, "", extJson.toString(), isOperationPdf());
 							} else if (mAddReport) {  // 作業追加ありの場合
 								// コールバック処理のみ行う。
-								afterABookCheckApi(mCmd, mTaskKey, 0, "", null, isOperationPdf());
+								String extParam = null;
+								if (mCmd.equals(ABookKeys.CMD_UNLOCK_REPORT)) {
+									extParam = "{'reportStatus':0, 'message':''}";
+								}
+								afterABookCheckApi(mCmd, mTaskKey, 0, "", extParam, isOperationPdf());
 							} else {
 								// 作業追加無しの場合、エラー発生時フォーム画面表示を維持するためにコールバックresult:1でする
 								if (isError) {