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

ダッシュボード関連の不具合対応

See merge request !276

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

@@ -61,11 +61,13 @@ import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportS
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.ReportStatusId;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.SendBackUserId;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.SendBackUserName;
+import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskCode;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskKey;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportId;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON.TaskReportInfo;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationListJSON.OperationList;
 import static jp.agentec.abook.abv.bl.acms.client.json.OperationListJSON.OperationName;
+import static jp.agentec.abook.abv.bl.common.Constant.HelpViewType.OperationDashboard;
 import static jp.agentec.abook.abv.bl.common.Constant.ReportType.RoutineTask;
 import static jp.agentec.abook.abv.bl.common.constant.ABookKeys.CMD_GET_REPORT_LIST;
 import static jp.agentec.abook.abv.bl.common.constant.ABookKeys.CMD_GET_REPORT_STATUS_COUNT;
@@ -95,6 +97,14 @@ public class DashboardActivity extends OperationActivity {
             }
         });
 
+        ImageButton helpButton = findViewById(R.id.btn_help);
+        helpButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showHelpViewDialog(OperationDashboard);
+            }
+        });
+
         progress = findViewById(R.id.refresh_prog);
 
         createWebView();
@@ -129,6 +139,7 @@ public class DashboardActivity extends OperationActivity {
         mDashboardButton.setEnabled(false);
     }
 
+    @SuppressLint("SetJavaScriptEnabled")
     private void createWebView() {
         webView = new CheckFormWebview(this, new CheckFormWebview.KeyActionCallback() {
 
@@ -160,7 +171,6 @@ public class DashboardActivity extends OperationActivity {
         Logger.d(TAG, "loadUrl: " + DASHBOARD_URL);
     }
 
-    @SuppressLint("SetJavaScriptEnabled")
     private void initSettings(WebSettings settings) {
 
         settings.setSupportMultipleWindows(true); // 新しいウィンドウを開くイベントを取得する
@@ -386,6 +396,7 @@ public class DashboardActivity extends OperationActivity {
             task.put(TaskKey, report.getTaskKey());
             task.put(TaskReportInfo, report.getTaskReportInfo());
             task.put(TaskReportId, report.getTaskReportId());
+            task.put(TaskCode, report.getTaskCode());
             task.put(ReportStartDate, report.getReportStartDateAsString());
             task.put(ReportLockUserId, report.getReportLockUserId());
             task.put(ReportLockUserName, report.getReportLockUserName());
@@ -527,5 +538,7 @@ public class DashboardActivity extends OperationActivity {
             Logger.e(TAG, e);
             throw e;
         }
+        // 強制的に画面更新するためにリロード fixme
+        webView.loadUrl(DASHBOARD_URL);
     }
 }

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

@@ -259,6 +259,12 @@ public class HelpActivity extends ABVUIActivity {
                 mMainDescription = PatternStringUtil.patternToString(getApplicationContext(),
                         R.string.msg_help_dashboard,
                         getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
+                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
+                        R.string.msg_help_report_locked,
+                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_unlock));
+                mHelpDisplayInfoList.add(settingHelpDisplayInfo(PatternStringUtil.patternToString(getApplicationContext(),
+                        R.string.msg_help_report_send_back,
+                        getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)), R.drawable.ic_sendback));
                 break;
         }
         if (!(helpViewTye == Constant.HelpViewType.OperationListDirector || helpViewTye == Constant.HelpViewType.OperationListReporter || helpViewTye == Constant.HelpViewType.OperationDetail)) {