PDFで帳票フォームの対応

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java

@@ -1134,7 +1134,8 @@ public class OperationLogic extends AbstractLogic {
         if (taskReportDtoList != null && taskReportDtoList.size() > 0) {
 
             int allSendCount = mTaskReportSendDao.getSendableTaskReportSendDataCount(operationId, taskKey);
-            int progress = maxProgress / allSendCount == 0 ? 1 : allSendCount;
+            allSendCount = allSendCount == 0 ? 1 : allSendCount;
+            int progress = maxProgress / allSendCount;
 
             // 送信済みsendIdをまとめて削除するため、リストに追加して最後に削除
             List<Integer> removeTaskReportSendIds = new ArrayList<Integer>();

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

@@ -940,6 +940,10 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 						closeProgressPopup();
 
 						if (ActivityHandlingHelper.getInstance().searchOzdActivityStack()) {  // OZD作業画面があるかを確認
+							// PDF且つ、一時保存の場合は、以下の処理を行わないでreturn null;で処理を終わらせる
+							if (mCmd.equals(ABookKeys.CMD_LOCAL_SAVE_TASK_REPORT) && isOperationPdf) {
+								return null;
+							}
 							if (!isError) {  // エラーがなしの場合
 								if (mAddReport) {  // 作業追加ありの場合
 									// コールバック処理のみ行う。

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java

@@ -83,6 +83,7 @@ import jp.agentec.abook.abv.ui.viewer.activity.ImageViewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.ParentWebViewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.PreviewActivity;
 import jp.agentec.abook.abv.ui.viewer.activity.VideoViewActivity;
+import jp.agentec.abook.abv.ui.viewer.view.OperationTaskLayout;
 import jp.agentec.adf.net.http.HttpDownloadSimpleNotification;
 import jp.agentec.adf.util.DateTimeFormat;
 import jp.agentec.adf.util.DateTimeUtil;
@@ -1599,6 +1600,8 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
                 final String scriptUrl = url;
                 if (activity instanceof ParentWebViewActivity) {
                     ((ParentWebViewActivity) activity).callViewLoadUrl(scriptUrl);
+                } else if (activity instanceof ContentViewActivity) {
+                    ((ContentViewActivity) activity).callOzWebViewLoadUrl(scriptUrl);
                 }
             }
         }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java

@@ -4972,6 +4972,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
         operationTaskLayout.taskWebViewLoadUrl(url);
     }
 
+    // OZDからのscript呼び出す用
+    public void callOzWebViewLoadUrl(String url) {
+    	operationTaskLayout.taskWebViewLoadUrl(url);
+	}
+
 	/**
 	 * PDFプロジェクトのアクション制御メソッド
 	 * @param checkParam