Skip to content

A
abook_check
Commit d3249b41 by Kazuyuki Hida
Options

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

ダッシュボードのロックが表示されない不具合に対応。

See merge request !295
parents 980f4d72 bfb0b3ba
Showing with 42 additions and 3 deletions
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
...@@ -25,20 +25,28 @@ import java.util.Collections; ...@@ -25,20 +25,28 @@ import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import jp.agentec.abook.abv.bl.acms.client.AcmsClient;
import jp.agentec.abook.abv.bl.acms.client.json.OperationDataJSON;
import jp.agentec.abook.abv.bl.acms.client.parameters.GetOperationDataParameters;
import jp.agentec.abook.abv.bl.acms.type.OperationType; import jp.agentec.abook.abv.bl.acms.type.OperationType;
import jp.agentec.abook.abv.bl.common.ABVEnvironment; import jp.agentec.abook.abv.bl.common.ABVEnvironment;
import jp.agentec.abook.abv.bl.common.Constant; import jp.agentec.abook.abv.bl.common.Constant;
import jp.agentec.abook.abv.bl.common.constant.ABookKeys; import jp.agentec.abook.abv.bl.common.constant.ABookKeys;
import jp.agentec.abook.abv.bl.common.log.Logger; import jp.agentec.abook.abv.bl.common.log.Logger;
import jp.agentec.abook.abv.bl.common.nw.NetworkAdapter;
import jp.agentec.abook.abv.bl.data.ABVDataCache;
import jp.agentec.abook.abv.bl.data.dao.AbstractDao; import jp.agentec.abook.abv.bl.data.dao.AbstractDao;
import jp.agentec.abook.abv.bl.data.dao.OperationContentDao; import jp.agentec.abook.abv.bl.data.dao.OperationContentDao;
import jp.agentec.abook.abv.bl.data.dao.OperationDao; import jp.agentec.abook.abv.bl.data.dao.OperationDao;
import jp.agentec.abook.abv.bl.data.dao.ReportStatusDao; import jp.agentec.abook.abv.bl.data.dao.ReportStatusDao;
import jp.agentec.abook.abv.bl.data.dao.TaskReportDao;
import jp.agentec.abook.abv.bl.download.ContentFileExtractor; import jp.agentec.abook.abv.bl.download.ContentFileExtractor;
import jp.agentec.abook.abv.bl.dto.ContentDto; import jp.agentec.abook.abv.bl.dto.ContentDto;
import jp.agentec.abook.abv.bl.dto.OperationContentDto; import jp.agentec.abook.abv.bl.dto.OperationContentDto;
import jp.agentec.abook.abv.bl.dto.OperationDto; import jp.agentec.abook.abv.bl.dto.OperationDto;
import jp.agentec.abook.abv.bl.dto.ReportStatusDto; import jp.agentec.abook.abv.bl.dto.ReportStatusDto;
import jp.agentec.abook.abv.bl.dto.TaskDto;
import jp.agentec.abook.abv.bl.dto.TaskReportDto;
import jp.agentec.abook.abv.bl.dto.comparator.ReportStatusCompalator; import jp.agentec.abook.abv.bl.dto.comparator.ReportStatusCompalator;
import jp.agentec.abook.abv.bl.logic.AbstractLogic; import jp.agentec.abook.abv.bl.logic.AbstractLogic;
import jp.agentec.abook.abv.bl.logic.LockReportLogic; import jp.agentec.abook.abv.bl.logic.LockReportLogic;
...@@ -120,6 +128,7 @@ public class DashboardActivity extends OperationActivity { ...@@ -120,6 +128,7 @@ public class DashboardActivity extends OperationActivity {
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
try { try {
loadAllOperationTask();
ReportStatusLogic logic = new ReportStatusLogic(); ReportStatusLogic logic = new ReportStatusLogic();
logic.loadReportStatus(); logic.loadReportStatus();
getReportStatusCount(); getReportStatusCount();
...@@ -142,6 +151,36 @@ public class DashboardActivity extends OperationActivity { ...@@ -142,6 +151,36 @@ public class DashboardActivity extends OperationActivity {
mDashboardButton.setEnabled(false); mDashboardButton.setEnabled(false);
} }
private void loadAllOperationTask() {
try {
String path = ABVDataCache.getInstance().getUrlPath();
NetworkAdapter networkAdapter = ABVEnvironment.getInstance().networkAdapter;
OperationDao operationDao = AbstractDao.getDao(OperationDao.class);
TaskReportDao taskReportDao = AbstractDao.getDao(TaskReportDao.class);
String sid = ABVDataCache.getInstance().getMemberInfo().sid;
for (OperationDto operation: operationDao.getAllOperation()) {
GetOperationDataParameters param = new GetOperationDataParameters(sid, operation.operationId);
OperationDataJSON json = AcmsClient.getInstance(path, networkAdapter).getOpereationData(param);
for (TaskDto task : json.taskDtoList) {
for (TaskReportDto report : task.taskReportDtoList) {
taskReportDao.updateReportLock(
report.taskKey,
(long) report.taskReportId,
report.reportStartDate,
report.reportStatus,
report.reportLockUserId,
report.reportLockUserName,
report.reportLockTime
);
}
}
}
} catch (Exception e) {
Logger.e(TAG, e.getLocalizedMessage());
}
}
@SuppressLint("SetJavaScriptEnabled") @SuppressLint("SetJavaScriptEnabled")
private void createWebView() { private void createWebView() {
webView = new CheckFormWebview(this, new CheckFormWebview.KeyActionCallback() { webView = new CheckFormWebview(this, new CheckFormWebview.KeyActionCallback() {
...@@ -314,9 +353,9 @@ public class DashboardActivity extends OperationActivity { ...@@ -314,9 +353,9 @@ public class DashboardActivity extends OperationActivity {
break; break;
} }
case CMD_UNLOCK_REPORT: { case CMD_UNLOCK_REPORT: {
String taskKey = json.getString(TaskKey); String taskKey = json.has(TaskKey) ? json.getString(TaskKey) : "";
long taskReportId = json.getLong(TaskReportId); long taskReportId = json.has(TaskReportId) ? json.getLong(TaskReportId) : 0;
Date reportStartDate = getDateOrNull(json.getString(ReportStartDate)); Date reportStartDate = json.has(ReportStartDate) ? getDateOrNull(json.getString(ReportStartDate)) : null;
unlockReport(taskKey, taskReportId, reportStartDate); unlockReport(taskKey, taskReportId, reportStartDate);
break; break;
} }
......
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