Commit 7e53583d by Kazuyuki Hida

命名のゆれを修正

parent 983574e5
...@@ -79,7 +79,7 @@ public class ReportStatusDao extends AbstractDao { ...@@ -79,7 +79,7 @@ public class ReportStatusDao extends AbstractDao {
return sql; return sql;
} }
public List<ReportStatusDto> getUntouchedReport() { public List<ReportStatusDto> getNotStartedReport() {
StringBuilder sql = reportStatusSql(); StringBuilder sql = reportStatusSql();
sql.append("WHERE t_task_report_status.untouched_flg <> 0"); sql.append("WHERE t_task_report_status.untouched_flg <> 0");
return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class); return rawQueryGetDtoList(sql.toString(), new String[] {}, ReportStatusDto.class);
...@@ -238,7 +238,7 @@ public class ReportStatusDao extends AbstractDao { ...@@ -238,7 +238,7 @@ public class ReportStatusDao extends AbstractDao {
4:期限切れ、5:アラート、 4:期限切れ、5:アラート、
6:差し戻し、7:一時保存 6:差し戻し、7:一時保存
*/ */
list.add(makeDto(0, getUntouchedReport().size())); list.add(makeDto(0, getNotStartedReport().size()));
list.add(makeDto(1, getWorkingReport().size())); list.add(makeDto(1, getWorkingReport().size()));
list.add(makeDto(2, getCompleteOkReport().size())); list.add(makeDto(2, getCompleteOkReport().size()));
list.add(makeDto(3, getCompleteNgReport().size())); list.add(makeDto(3, getCompleteNgReport().size()));
......
...@@ -986,7 +986,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -986,7 +986,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
// データを同期する fixme かなり邪道なことをしているので、非同期処理全体を整理する必要がある // データを同期する fixme かなり邪道なことをしているので、非同期処理全体を整理する必要がある
ActivityHandlingHelper helper = ActivityHandlingHelper.getInstance(); ActivityHandlingHelper helper = ActivityHandlingHelper.getInstance();
helper.getPreviousOperationListActivity().syncOperation(operationDto.operationId, operationDto.reportType, false); helper.getPreviousOperationListActivity().syncOperation(operationDto.operationId, operationDto.reportType, false);
ABVEnvironment env = ABVEnvironment.getInstance();
OperationLogic logic = AbstractLogic.getLogic(OperationLogic.class); OperationLogic logic = AbstractLogic.getLogic(OperationLogic.class);
try { try {
logic.createJsonForOperationContent(operationDto.operationId, mContentPath, operationDto.reportType == Constant.ReportType.RoutineTask); logic.createJsonForOperationContent(operationDto.operationId, mContentPath, operationDto.reportType == Constant.ReportType.RoutineTask);
......
...@@ -334,7 +334,7 @@ public class DashboardActivity extends OperationActivity { ...@@ -334,7 +334,7 @@ public class DashboardActivity extends OperationActivity {
List<ReportStatusDto> reports = null; List<ReportStatusDto> reports = null;
switch (reportStatusId) { switch (reportStatusId) {
case 0: { case 0: {
reports = dao.getUntouchedReport(); reports = dao.getNotStartedReport();
break; break;
} }
case 1: { case 1: {
......
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