Skip to content

A
abook_check
Commit ec27fafb by Yujin Seo
Options

Merge branch 'feature/contract/sato/1.0.300_51417' into 'contract/sato/1.0.300_dev' 

#51417 ステータス表示追加

See merge request !259
parents 76978cd6 0228b69f
Showing with 256 additions and 128 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/OperationDataJSON.java
...@@ -27,7 +27,6 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -27,7 +27,6 @@ public class OperationDataJSON extends AcmsCommonJSON {
public static final String TaskStatus = "taskStatus"; public static final String TaskStatus = "taskStatus";
public static final String TaskHotspotInfo = "taskHotspotInfo"; public static final String TaskHotspotInfo = "taskHotspotInfo";
public static final String Task = "task"; public static final String Task = "task";
// 1.0.1で追加 // 1.0.1で追加
public static final String TaskReportId = "taskReportId"; // 作業報告書ID ※定期点検のみ public static final String TaskReportId = "taskReportId"; // 作業報告書ID ※定期点検のみ
public static final String TaskReportList = "taskReportList"; // 作業報告詳細リスト public static final String TaskReportList = "taskReportList"; // 作業報告詳細リスト
...@@ -39,6 +38,13 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -39,6 +38,13 @@ public class OperationDataJSON extends AcmsCommonJSON {
public static final String TaskReportKey = "taskReportKey"; // 作業報告キー public static final String TaskReportKey = "taskReportKey"; // 作業報告キー
public static final String TaskReportInfo = "taskReportInfo"; // 作業報告データ public static final String TaskReportInfo = "taskReportInfo"; // 作業報告データ
public static final String ReportLockUserId = "reportLockUserId"; // 報告ロックユーザId
public static final String ReportLockUserName = "reportLockUserName"; // 報告ロックユーザ名
public static final String ReportLockTime = "reportLockTime"; // 報告ロック日時
public static final String SendBackUserId = "sendBackUserId"; // 差し戻しユーザId 差し戻された場合のみ
public static final String SendBackUserName = "sendBackUserName"; // 差し戻しユーザ名 差し戻された場合のみ
public static final String SendBackComment = "sendBackComment"; // 確認コメント 差し戻された場合のみ
public List<TaskDto> taskDtoList; public List<TaskDto> taskDtoList;
public Date lastEditDate; public Date lastEditDate;
...@@ -115,6 +121,27 @@ public class OperationDataJSON extends AcmsCommonJSON { ...@@ -115,6 +121,27 @@ public class OperationDataJSON extends AcmsCommonJSON {
} else { } else {
taskReportDto.jsonData = ""; taskReportDto.jsonData = "";
} }
if (taskReportJson.has(ReportLockUserId)) {
taskReportDto.reportLockUserId = taskReportJson.getString(ReportLockUserId);
}
if (taskReportJson.has(ReportLockUserName)) {
taskReportDto.reportLockUserName = taskReportJson.getString(ReportLockUserName);
}
if (taskReportJson.has(ReportLockTime)) {
taskReportDto.reportLockTime = DateTimeUtil.toDate(taskReportJson.getString(ReportLockTime), DateTimeFormat.yyyyMMddHHmmss_hyphen);
}
if (taskReportJson.has(SendBackUserId)) {
taskReportDto.sendBackUserId = taskReportJson.getString(SendBackUserId);
}
if (taskReportJson.has(SendBackUserName)) {
taskReportDto.sendBackUserName = taskReportJson.getString(SendBackUserName);
}
if (taskReportJson.has(SendBackComment)) {
taskReportDto.sendBackComment = taskReportJson.getString(SendBackComment);
}
if (taskReportJson.has(TaskStatus)) {
taskReportDto.taskStatus = taskReportJson.getInt(TaskStatus);
}
dto.taskReportDtoList.add(taskReportDto); dto.taskReportDtoList.add(taskReportDto);
} }
taskDtoList.add(dto); taskDtoList.add(dto);
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
...@@ -298,6 +298,9 @@ public class OperationDao extends AbstractDao { ...@@ -298,6 +298,9 @@ public class OperationDao extends AbstractDao {
sql.append(" top.enable_report_update, "); sql.append(" top.enable_report_update, ");
sql.append(" top.enable_report_edit, "); sql.append(" top.enable_report_edit, ");
sql.append(" top.enable_add_report, "); sql.append(" top.enable_add_report, ");
sql.append(" top.status_not_started_count, ");
sql.append(" top.status_working_count, ");
sql.append(" top.status_completed_count, ");
sql.append(" CASE "); sql.append(" CASE ");
sql.append(" WHEN report_type = 1 THEN ( "); sql.append(" WHEN report_type = 1 THEN ( ");
sql.append(" SELECT strftime('%Y/%m/%d %H:%M', datetime(ttr.report_start_date, 'localtime')) || ' ~ ' || strftime('%Y/%m/%d %H:%M', datetime(ttr.report_end_date, 'localtime')) "); sql.append(" SELECT strftime('%Y/%m/%d %H:%M', datetime(ttr.report_start_date, 'localtime')) || ' ~ ' || strftime('%Y/%m/%d %H:%M', datetime(ttr.report_end_date, 'localtime')) ");
...@@ -460,6 +463,9 @@ public class OperationDao extends AbstractDao { ...@@ -460,6 +463,9 @@ public class OperationDao extends AbstractDao {
sql.append(" top.enable_report_update, "); sql.append(" top.enable_report_update, ");
sql.append(" top.enable_report_edit, "); sql.append(" top.enable_report_edit, ");
sql.append(" top.enable_add_report, "); sql.append(" top.enable_add_report, ");
sql.append(" top.status_not_started_count, ");
sql.append(" top.status_working_count, ");
sql.append(" top.status_completed_count, ");
sql.append(" CASE "); sql.append(" CASE ");
sql.append(" WHEN report_type = 1 THEN ( "); sql.append(" WHEN report_type = 1 THEN ( ");
sql.append(" SELECT strftime('%Y/%m/%d %H:%M', datetime(ttr.report_start_date, 'localtime')) || ' ~ ' || strftime('%Y/%m/%d %H:%M', datetime(ttr.report_end_date, 'localtime')) "); sql.append(" SELECT strftime('%Y/%m/%d %H:%M', datetime(ttr.report_start_date, 'localtime')) || ' ~ ' || strftime('%Y/%m/%d %H:%M', datetime(ttr.report_end_date, 'localtime')) ");
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
...@@ -128,7 +128,7 @@ public class TaskReportDao extends AbstractDao { ...@@ -128,7 +128,7 @@ public class TaskReportDao extends AbstractDao {
} }
column = cursor.getColumnIndex("task_status"); column = cursor.getColumnIndex("task_status");
if (column != -1) { if (column != -1) {
dto.taskStatus = cursor.getString(column); dto.taskStatus = cursor.getInt(column);
} }
column = cursor.getColumnIndex("report_status"); column = cursor.getColumnIndex("report_status");
if (column != -1) { if (column != -1) {
......
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/tables/TTaskReport.java
...@@ -42,7 +42,7 @@ public class TTaskReport extends SQLiteTableScript { ...@@ -42,7 +42,7 @@ public class TTaskReport extends SQLiteTableScript {
sql.append(" , send_back_user_name TEXT "); // 差し戻しユーザ名 差し戻された場合のみ sql.append(" , send_back_user_name TEXT "); // 差し戻しユーザ名 差し戻された場合のみ
sql.append(" , send_back_comment TEXT "); // 確認コメント 差し戻された場合のみ sql.append(" , send_back_comment TEXT "); // 確認コメント 差し戻された場合のみ
sql.append(" , report_status INTEGER NOT NULL DEFAULT 0 "); // 0:ロック成功、1:ロック中、2:承認中、999:その他エラー sql.append(" , report_status INTEGER NOT NULL DEFAULT 0 "); // 0:ロック成功、1:ロック中、2:承認中、999:その他エラー
sql.append(" , task_status TEXT "); // 状況 0：未実施、1：作業中、999：作業完了 sql.append(" , task_status INTEGER NOT NULL DEFAULT 0 "); // 状況 0：未実施、1：作業中、999：作業完了
sql.append(" ) "); sql.append(" ) ");
ddl.add(sql.toString()); ddl.add(sql.toString());
...@@ -60,7 +60,7 @@ public class TTaskReport extends SQLiteTableScript { ...@@ -60,7 +60,7 @@ public class TTaskReport extends SQLiteTableScript {
ddl.add(" ALTER TABLE t_task_report ADD COLUMN send_back_user_id TEXT"); // 差し戻しユーザId 差し戻された場合のみ" + ddl.add(" ALTER TABLE t_task_report ADD COLUMN send_back_user_id TEXT"); // 差し戻しユーザId 差し戻された場合のみ" +
ddl.add(" ALTER TABLE t_task_report ADD COLUMN send_back_user_name TEXT"); // 差し戻しユーザ名 差し戻された場合のみ ddl.add(" ALTER TABLE t_task_report ADD COLUMN send_back_user_name TEXT"); // 差し戻しユーザ名 差し戻された場合のみ
ddl.add(" ALTER TABLE t_task_report ADD COLUMN send_back_comment TEXT"); // 確認コメント 差し戻された場合のみ ddl.add(" ALTER TABLE t_task_report ADD COLUMN send_back_comment TEXT"); // 確認コメント 差し戻された場合のみ
ddl.add(" ALTER TABLE t_task_report ADD COLUMN task_status TEXT"); // 状況 0：未実施、1：作業中、999：作業完了 ddl.add(" ALTER TABLE t_task_report ADD COLUMN task_status INTEGER NOT NULL DEFAULT 0"); // 状況 0：未実施、1：作業中、999：作業完了
} }
if (oldVersion < DatabaseVersions.Ver1_0_6) { if (oldVersion < DatabaseVersions.Ver1_0_6) {
ddl.add(" ALTER TABLE t_task_report ADD COLUMN report_status INTEGER NOT NULL DEFAULT 0"); // 0:ロック成功、1:ロック中、2:承認中、999:その他エラー ddl.add(" ALTER TABLE t_task_report ADD COLUMN report_status INTEGER NOT NULL DEFAULT 0"); // 0:ロック成功、1:ロック中、2:承認中、999:その他エラー
......
ABVJE_UI_Android/res/layout-large/item_operation_list.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_layout" android:id="@+id/list_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/list_selector_holo_light" android:background="@drawable/list_selector_holo_light"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:padding="10dp" android:padding="10dp"
android:orientation="horizontal"> android:orientation="horizontal"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -64,20 +66,52 @@ ...@@ -64,20 +66,52 @@
android:textSize="@dimen/operation_date_text_size" /> android:textSize="@dimen/operation_date_text_size" />
</LinearLayout> </LinearLayout>
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:id="@+id/report_count_not_started"
android:layout_width="@dimen/report_status_width_1"
android:layout_height="@dimen/report_status_height_1"
android:layout_margin="4dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/marking_color_9"
/>
<TextView
android:id="@+id/report_count_working"
android:layout_width="@dimen/report_status_width_1"
android:layout_height="@dimen/report_status_height_1"
android:layout_margin="4dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/app_color"
/>
<TextView
android:id="@+id/report_count_completed"
android:layout_width="@dimen/report_status_width_1"
android:layout_height="@dimen/report_status_height_1"
android:layout_margin="4dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/marking_color_8"
/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageButton <ImageButton
android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_edit_list"
android:visibility="invisible" />
<ImageButton
android:id="@+id/btn_sync" android:id="@+id/btn_sync"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
ABVJE_UI_Android/res/layout-large/item_operation_panel.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -8,7 +9,8 @@ ...@@ -8,7 +9,8 @@
android:paddingTop="20dp" android:paddingTop="20dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:orientation="vertical"> android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:id="@+id/panel_layout" android:id="@+id/panel_layout"
...@@ -33,26 +35,70 @@ ...@@ -33,26 +35,70 @@
android:id="@+id/report_type" android:id="@+id/report_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp" /> android:layout_marginRight="10dp" />
<ImageView <ImageView
android:id="@+id/operation_type" android:id="@+id/operation_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp" />
</LinearLayout> </LinearLayout>
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="right" android:orientation="horizontal"
android:orientation="horizontal"> android:layout_marginRight="10dp" >
<ImageButton <TextView
android:id="@+id/btn_pano_edit" android:id="@+id/report_count_not_started"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_2"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/marking_color_9"
/>
<TextView
android:id="@+id/report_count_working"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_2"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/app_color"
/>
<TextView
android:id="@+id/report_count_completed"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_2"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/marking_color_8"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="@drawable/ic_edit_panel" android:layout_gravity="right"
android:visibility="invisible" /> android:gravity="right"
android:orientation="horizontal">
<ImageButton <ImageButton
android:id="@+id/btn_sync" android:id="@+id/btn_sync"
......
ABVJE_UI_Android/res/layout-normal/item_operation_list.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_layout" android:id="@+id/list_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
android:padding="10dp" android:padding="10dp"
android:orientation="vertical"> android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
...@@ -15,7 +17,7 @@ ...@@ -15,7 +17,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="5dp" android:layout_marginRight="5dp"
android:layout_weight="1" android:layout_weight="1"
...@@ -38,6 +40,7 @@ ...@@ -38,6 +40,7 @@
android:id="@+id/operation_name" android:id="@+id/operation_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="2" android:maxLines="2"
android:ellipsize="end" android:ellipsize="end"
android:text="@string/dummy_str" android:text="@string/dummy_str"
...@@ -71,6 +74,48 @@ ...@@ -71,6 +74,48 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:orientation="vertical">
<TextView
android:id="@+id/report_count_not_started"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_3"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="8pt"
android:gravity="center"
android:background="@color/marking_color_9"
/>
<TextView
android:id="@+id/report_count_working"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_3"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="8pt"
android:gravity="center"
android:background="@color/app_color"
/>
<TextView
android:id="@+id/report_count_completed"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_3"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="8pt"
android:gravity="center"
android:background="@color/marking_color_8"
/>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -78,14 +123,6 @@ ...@@ -78,14 +123,6 @@
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView
android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginRight="5dp"
android:background="@drawable/ic_edit_list" />
<ImageButton <ImageButton
android:id="@+id/btn_sync" android:id="@+id/btn_sync"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
ABVJE_UI_Android/res/layout-normal/item_operation_panel.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -8,7 +10,8 @@ ...@@ -8,7 +10,8 @@
android:paddingTop="20dp" android:paddingTop="20dp"
android:paddingRight="30dp" android:paddingRight="30dp"
android:paddingLeft="30dp" android:paddingLeft="30dp"
android:orientation="vertical"> android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:id="@+id/panel_layout" android:id="@+id/panel_layout"
...@@ -38,7 +41,42 @@ ...@@ -38,7 +41,42 @@
<ImageView <ImageView
android:id="@+id/operation_type" android:id="@+id/operation_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:layout_marginRight="10dp" />
<TextView
android:id="@+id/report_count_not_started"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_2"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/marking_color_9"
/>
<TextView
android:id="@+id/report_count_working"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_2"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/app_color"
/>
<TextView
android:id="@+id/report_count_completed"
android:layout_width="@dimen/report_status_width_2"
android:layout_height="@dimen/report_status_height_2"
android:layout_margin="2dp"
android:layout_gravity="center_vertical"
android:textColor="@color/basic_white1"
android:textSize="9pt"
android:gravity="center"
android:background="@color/marking_color_8"
/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -48,13 +86,6 @@ ...@@ -48,13 +86,6 @@
android:orientation="horizontal"> android:orientation="horizontal">
<ImageButton <ImageButton
android:id="@+id/btn_pano_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_edit_panel"
android:visibility="invisible" />
<ImageButton
android:id="@+id/btn_sync" android:id="@+id/btn_sync"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
ABVJE_UI_Android/res/values/dimens.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="opeartion_title_text_size" /> <dimen name="opeartion_title_text_size" />
<dimen name="report_status_height_1">48dp</dimen>
<dimen name="report_status_height_2">32dp</dimen>
<dimen name="report_status_height_3">24dp</dimen>
<dimen name="report_status_width_1">80dp</dimen>
<dimen name="report_status_width_2">36dp</dimen>
</resources> </resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/AbstractOperationAdapter.java
package jp.agentec.abook.abv.ui.home.adapter; package jp.agentec.abook.abv.ui.home.adapter;
import android.os.AsyncTask;
import android.view.View;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.ImageView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
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.ContentDao; import jp.agentec.abook.abv.bl.data.dao.ContentDao;
import jp.agentec.abook.abv.bl.dto.OperationDto; import jp.agentec.abook.abv.bl.dto.OperationDto;
import jp.agentec.abook.abv.launcher.android.R;
/** /**
* Created by leej on 2019/03/06. * Created by leej on 2019/03/06.
...@@ -24,8 +19,6 @@ public abstract class AbstractOperationAdapter extends BaseAdapter { ...@@ -24,8 +19,6 @@ public abstract class AbstractOperationAdapter extends BaseAdapter {
protected ContentDao mContentDao = AbstractDao.getDao(ContentDao.class); protected ContentDao mContentDao = AbstractDao.getDao(ContentDao.class);
public interface AbstractOperationListAdapterListener { public interface AbstractOperationListAdapterListener {
// 360編集
void onPanoEdit(OperationDto operationDto);
// 同期処理 // 同期処理
void onSyncOperation(OperationDto OperationDto); void onSyncOperation(OperationDto OperationDto);
// 報告・パノラマ画像登録画面の表示 // 報告・パノラマ画像登録画面の表示
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/OperationListAdapter.java
...@@ -71,12 +71,14 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -71,12 +71,14 @@ public class OperationListAdapter extends AbstractOperationAdapter {
// 作業ベースタイプ // 作業ベースタイプ
holder.ivOperationType = convertView.findViewById(R.id.operation_type); holder.ivOperationType = convertView.findViewById(R.id.operation_type);
// 360編集関連
holder.ivPanoEdit = convertView.findViewById(R.id.btn_pano_edit);
// 情報更新関連 // 情報更新関連
holder.ivSync = convertView.findViewById(R.id.btn_sync); holder.ivSync = convertView.findViewById(R.id.btn_sync);
// ステータス別作業数
holder.reportCountNotStarted = convertView.findViewById(R.id.report_count_not_started);
holder.reportCountWorking = convertView.findViewById(R.id.report_count_working);
holder.reportCountCompleted = convertView.findViewById(R.id.report_count_completed);
convertView.setTag(holder); convertView.setTag(holder);
} else { } else {
holder = (ViewHolder) convertView.getTag(); holder = (ViewHolder) convertView.getTag();
...@@ -126,26 +128,9 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -126,26 +128,9 @@ public class OperationListAdapter extends AbstractOperationAdapter {
holder.ivSync.setVisibility(View.INVISIBLE); holder.ivSync.setVisibility(View.INVISIBLE);
} }
if(operationDto.operationType == OperationType.PANO) { holder.reportCountNotStarted.setText(String.valueOf(operationDto.statusNotStartedCount));
if (operationDto.enableReportEdit == Constant.EnableReportEdit.NO) { holder.reportCountWorking.setText(String.valueOf(operationDto.statusWorkingCount));
holder.ivPanoEdit.setVisibility(View.INVISIBLE); holder.reportCountCompleted.setText(String.valueOf(operationDto.statusCompletedCount));
} else {
// 360タイプのみ360編集ボタン表示
holder.ivPanoEdit.setVisibility(View.VISIBLE);
if (operationDto.contentCreatingFlg) { //Panoコンテンツ作成中の状態
holder.ivPanoEdit.setVisibility(View.INVISIBLE);
holder.ivSync.setVisibility(View.INVISIBLE);
} else {
if (operationDto.contentId == null || operationDto.contentId != 0) {
holder.ivPanoEdit.setVisibility(View.VISIBLE);
} else {
holder.ivPanoEdit.setVisibility(View.INVISIBLE);
}
}
}
} else {
holder.ivPanoEdit.setVisibility(View.INVISIBLE);
}
// 全体のレイアウト（ボタン以外）のタップ処理 // 全体のレイアウト（ボタン以外）のタップ処理
holder.listLayout.setOnClickListener(new View.OnClickListener() { holder.listLayout.setOnClickListener(new View.OnClickListener() {
...@@ -154,13 +139,6 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -154,13 +139,6 @@ public class OperationListAdapter extends AbstractOperationAdapter {
listener.openReport(operationDto); listener.openReport(operationDto);
} }
}); });
// 360編集ボタンのタップイベント
holder.ivPanoEdit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
listener.onPanoEdit(operationDto);
}
});
// 同期ボタンのタップイベント // 同期ボタンのタップイベント
holder.ivSync.setOnClickListener(new View.OnClickListener() { holder.ivSync.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -182,11 +160,14 @@ public class OperationListAdapter extends AbstractOperationAdapter { ...@@ -182,11 +160,14 @@ public class OperationListAdapter extends AbstractOperationAdapter {
ImageView ivReportType; ImageView ivReportType;
ImageView ivOperationType; ImageView ivOperationType;
// 360編集関連
ImageView ivPanoEdit;
// 情報更新関連 // 情報更新関連
ImageView ivSync; ImageView ivSync;
// ステータス別作業数
TextView reportCountNotStarted;
TextView reportCountWorking;
TextView reportCountCompleted;
} }
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/adapter/OperationPanelAdapter.java
...@@ -11,7 +11,6 @@ import android.widget.TextView; ...@@ -11,7 +11,6 @@ import android.widget.TextView;
import java.util.List; import java.util.List;
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.Constant;
import jp.agentec.abook.abv.bl.common.Constant.ReportType; import jp.agentec.abook.abv.bl.common.Constant.ReportType;
import jp.agentec.abook.abv.bl.dto.OperationDto; import jp.agentec.abook.abv.bl.dto.OperationDto;
import jp.agentec.abook.abv.launcher.android.R; import jp.agentec.abook.abv.launcher.android.R;
...@@ -81,14 +80,14 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -81,14 +80,14 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
ImageView ivReportType; ImageView ivReportType;
ImageView ivOperationType; ImageView ivOperationType;
// パンネルのレイアウト // パンネルのレイアウト
LinearLayout panelLayout; LinearLayout panelLayout;
// 360編集関連
ImageView ivPanoEdit;
// 同期関連 // 同期関連
ImageView ivSync; ImageView ivSync;
// ステータス別作業数
TextView reportCountNotStarted;
TextView reportCountWorking;
TextView reportCountCompleted;
} }
@Override @Override
...@@ -106,12 +105,14 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -106,12 +105,14 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
// 作業ベースタイプ // 作業ベースタイプ
holder.ivOperationType = convertView.findViewById(R.id.operation_type); holder.ivOperationType = convertView.findViewById(R.id.operation_type);
// 360編集関連
holder.ivPanoEdit = convertView.findViewById(R.id.btn_pano_edit);
// 同期関連 // 同期関連
holder.ivSync = convertView.findViewById(R.id.btn_sync); holder.ivSync = convertView.findViewById(R.id.btn_sync);
// ステータス別作業数
holder.reportCountNotStarted = convertView.findViewById(R.id.report_count_not_started);
holder.reportCountWorking = convertView.findViewById(R.id.report_count_working);
holder.reportCountCompleted = convertView.findViewById(R.id.report_count_completed);
convertView.setTag(holder); convertView.setTag(holder);
} else { } else {
holder = (OperationPanelAdapter.ViewHolder) convertView.getTag(); holder = (OperationPanelAdapter.ViewHolder) convertView.getTag();
...@@ -154,25 +155,9 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -154,25 +155,9 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
holder.ivSync.setVisibility(View.INVISIBLE); holder.ivSync.setVisibility(View.INVISIBLE);
} }
holder.reportCountNotStarted.setText(String.valueOf(operationDto.statusNotStartedCount));
if(operationDto.operationType == OperationType.PANO) { holder.reportCountWorking.setText(String.valueOf(operationDto.statusWorkingCount));
if (operationDto.enableReportEdit == Constant.EnableReportEdit.NO) { holder.reportCountCompleted.setText(String.valueOf(operationDto.statusCompletedCount));
holder.ivPanoEdit.setVisibility(View.INVISIBLE);
} else {
if (operationDto.contentCreatingFlg) { //Panoコンテンツ作成中の状態
holder.ivPanoEdit.setVisibility(View.INVISIBLE);
holder.ivSync.setVisibility(View.INVISIBLE);
} else {
if (operationDto.contentId != null && operationDto.contentId != 0) {
holder.ivPanoEdit.setVisibility(View.VISIBLE);
} else {
holder.ivPanoEdit.setVisibility(View.INVISIBLE);
}
}
}
} else {
holder.ivPanoEdit.setVisibility(View.INVISIBLE);
}
// 全体のレイアウト（ボタン以外）のタップ処理 // 全体のレイアウト（ボタン以外）のタップ処理
holder.panelLayout.setOnClickListener(new View.OnClickListener() { holder.panelLayout.setOnClickListener(new View.OnClickListener() {
...@@ -182,13 +167,6 @@ public class OperationPanelAdapter extends AbstractOperationAdapter { ...@@ -182,13 +167,6 @@ public class OperationPanelAdapter extends AbstractOperationAdapter {
} }
}); });
// 360編集ボタンのタップイベント
holder.ivPanoEdit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
listener.onPanoEdit(operationDto);
}
});
// 同期ボタンのタップイベント // 同期ボタンのタップイベント
holder.ivSync.setOnClickListener(new View.OnClickListener() { holder.ivSync.setOnClickListener(new View.OnClickListener() {
@Override @Override
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationListHelper.java
...@@ -163,12 +163,6 @@ public abstract class OperationListHelper { ...@@ -163,12 +163,6 @@ public abstract class OperationListHelper {
} }
@Override @Override
public void onPanoEdit(OperationDto operationDto) {
// 360編集処理
mAppActivity.startPanoEdit(operationDto);
}
@Override
public void onSyncOperation(final OperationDto operationDto) { public void onSyncOperation(final OperationDto operationDto) {
// 同期処理 // 同期処理
mAppActivity.startSyncOperation(operationDto); mAppActivity.startSyncOperation(operationDto);
...@@ -231,12 +225,6 @@ public abstract class OperationListHelper { ...@@ -231,12 +225,6 @@ public abstract class OperationListHelper {
} }
@Override @Override
public void onPanoEdit(OperationDto operationDto) {
// 360編集処理
mAppActivity.startPanoEdit(operationDto);
}
@Override
public void onSyncOperation(final OperationDto operationDto) { public void onSyncOperation(final OperationDto operationDto) {
// 同期処理 // 同期処理
mAppActivity.startSyncOperation(operationDto); mAppActivity.startSyncOperation(operationDto);
......
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