フィルタに選択されてるとアイコン変更

#33352 定期点検で、点検後修正不可状態で修正ができる

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java

@@ -136,12 +136,13 @@ public class TaskReportDao extends AbstractDao {
         sql.append("report_end_date=?, ");
         sql.append("report_end_date=?, ");
         sql.append("enable_report=?, ");
         sql.append("enable_report=?, ");
         sql.append("task_report_level=?, ");
         sql.append("task_report_level=?, ");
-        sql.append("local_saved_flg=? ");
+        sql.append("local_saved_flg=?, ");
+        sql.append("task_report_info_id=? ");
         sql.append("WHERE task_key=? AND task_report_level=?");
         sql.append("WHERE task_key=? AND task_report_level=?");
         if (dto.reportStartDate != null) {
         if (dto.reportStartDate != null) {
             sql.append(" AND datetime(report_start_date)=datetime(?)");
             sql.append(" AND datetime(report_start_date)=datetime(?)");
             objects = new Object[]{dto.jsonData, dto.attachedFileName, dto.localAttachedFileName, dto.attachedFileSendFlg, dto.dataSendFlg,
             objects = new Object[]{dto.jsonData, dto.attachedFileName, dto.localAttachedFileName, dto.attachedFileSendFlg, dto.dataSendFlg,
-                    dto.reportEndDate, dto.enableReport, dto.taskReportLevel, dto.localSavedFlg, dto.taskKey, dto.taskReportLevel, dto.reportStartDate};
+                    dto.reportEndDate, dto.enableReport, dto.taskReportLevel, dto.localSavedFlg, dto.taskReportInfoId, dto.taskKey, dto.taskReportLevel, dto.reportStartDate};
         } else {
         } else {
             objects = new Object[]{dto.jsonData, dto.attachedFileName, dto.localAttachedFileName, dto.attachedFileSendFlg, dto.dataSendFlg,
             objects = new Object[]{dto.jsonData, dto.attachedFileName, dto.localAttachedFileName, dto.attachedFileSendFlg, dto.dataSendFlg,
                     dto.reportEndDate, dto.enableReport, dto.taskReportLevel, dto.localSavedFlg, dto.taskKey, dto.taskReportLevel};
                     dto.reportEndDate, dto.enableReport, dto.taskReportLevel, dto.localSavedFlg, dto.taskKey, dto.taskReportLevel};

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

@@ -357,7 +357,8 @@ public class OperationListActivity extends ABVUIActivity {
             mCommonContentButton.setImageDrawable(getRDrawable(R.drawable.ic_common_content_off));
             mCommonContentButton.setImageDrawable(getRDrawable(R.drawable.ic_common_content_off));
             mCommonContentButton.setEnabled(false);
             mCommonContentButton.setEnabled(false);
         }
         }
-
+        // フィルター選択判定
+        checkSelectedFilterType();
     }
     }
 
 
     /**
     /**
@@ -1890,4 +1891,18 @@ public class OperationListActivity extends ABVUIActivity {
         Logger.d(TAG, "ABVEnvironment.getInstance().resourcePatternType : " + ABVEnvironment.getInstance().resourcePatternType);
         Logger.d(TAG, "ABVEnvironment.getInstance().resourcePatternType : " + ABVEnvironment.getInstance().resourcePatternType);
         putUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, ABVEnvironment.getInstance().resourcePatternType);
         putUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, ABVEnvironment.getInstance().resourcePatternType);
     }
     }
+
+    /**
+     * フィルターの選択があるか判定して、画像を変更
+     */
+    private void checkSelectedFilterType() {
+        List<Integer> defaultTypeList = getOperationReportTypeList(true);
+        ArrayList<Integer> selectedOperationReportTypes = getOperationReportTypeList(false);
+        ImageButton imgBtn = (ImageButton) findViewById(R.id.icon_filter);
+        if (defaultTypeList.size() == selectedOperationReportTypes.size()) {
+            imgBtn.setImageDrawable(getRDrawable(R.drawable.ic_filter));
+        } else {
+            imgBtn.setImageDrawable(getRDrawable(R.drawable.ic_filter_selected));
+        }
+    }
 }
 }