Skip to content

A
abook_check
Commit 10472ee2 by Lee Jaebin
Options

#34190 作業種別毎に作業を絞り込み機能追加

parent b6731bf7
Showing with 108 additions and 70 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationDao.java
...@@ -375,6 +375,7 @@ public class OperationDao extends AbstractDao { ...@@ -375,6 +375,7 @@ public class OperationDao extends AbstractDao {
sql.append(" INNER JOIN r_operation_group_master_relation AS rog"); sql.append(" INNER JOIN r_operation_group_master_relation AS rog");
sql.append(" ON rog.operation_id = top.operation_id"); sql.append(" ON rog.operation_id = top.operation_id");
sql.append(" WHERE rog.operation_group_master_id = ?"); sql.append(" WHERE rog.operation_group_master_id = ?");
sql.append(" ORDER BY top.operation_start_date DESC, top.operation_id DESC");
return rawQueryGetDtoList(sql.toString(), new String[] { "" + operationGroupMasterId }, OperationDto.class); return rawQueryGetDtoList(sql.toString(), new String[] { "" + operationGroupMasterId }, OperationDto.class);
} }
} }
\ No newline at end of file
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/OperationGroupMasterDao.java
...@@ -100,12 +100,13 @@ public class OperationGroupMasterDao extends AbstractDao { ...@@ -100,12 +100,13 @@ public class OperationGroupMasterDao extends AbstractDao {
/** /**
* 親階層のIDで子供の階層を取得 * 親階層のIDで子供の階層を取得
* sort：作業種別名　昇順
* @param parentId * @param parentId
* @return * @return
*/ */
public List<OperationGroupMasterDto> getOperationGroupMasterChildList(int parentId) { public List<OperationGroupMasterDto> getOperationGroupMasterChildList(int parentId) {
List<OperationGroupMasterDto> list; List<OperationGroupMasterDto> list;
list = rawQueryGetDtoList("select * from m_operation_group_master mogm where (mogm.parent_operation_group_master_id = ?)", new String[]{""+ parentId}, OperationGroupMasterDto.class); list = rawQueryGetDtoList("select * from m_operation_group_master where parent_operation_group_master_id = ? order by operation_group_master_name ASC", new String[]{""+ parentId}, OperationGroupMasterDto.class);
return list; return list;
} }
......
ABVJE_Res_Default_Android/res/drawable/operation_location_segment_background.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_checked="true"
android:state_pressed="true"
android:drawable="@drawable/operation_location_segment_off" />
<item
android:state_checked="true"
android:drawable="@drawable/operation_location_segment_on" />
<item
android:state_checked="false"
android:state_pressed="true"
android:drawable="@drawable/operation_location_segment_off" />
<item
android:state_checked="false"
android:drawable="@drawable/operation_location_segment_off" />
</selector>
ABVJE_Res_Default_Android/res/drawable/operation_location_segment_off.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<stroke android:width="1dp" android:color="@android:color/white" />
<solid android:color="@color/operation_color"/>
</shape>
ABVJE_Res_Default_Android/res/drawable/operation_location_segment_on.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<stroke android:width="1dp" android:color="@android:color/white" />
<solid android:color="@android:color/white"/>
</shape>
ABVJE_Res_Default_Android/res/drawable/operation_location_text_color.xml 0 → 100644
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/operation_color" android:state_checked="true" />
<item android:color="@android:color/white" android:state_checked="false"/>
</selector>
\ No newline at end of file
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -519,6 +519,10 @@ ...@@ -519,6 +519,10 @@
<string name="msg_help_360_move">このボタンを押すと作業コードラベルを移動させることができるようになります。</string> <string name="msg_help_360_move">このボタンを押すと作業コードラベルを移動させることができるようになります。</string>
<string name="msg_help_360_touch">このボタンを押すと作業コードボタンのタップが可能になり、報告できるようになります。</string> <string name="msg_help_360_touch">このボタンを押すと作業コードボタンのタップが可能になり、報告できるようになります。</string>
<!-- 1.1.0 -->
<string name="operation_category">カテゴリ</string>
<string name="type_all">全て</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
<string name="meetingroom_setting_1">会議室設定(1)</string> <string name="meetingroom_setting_1">会議室設定(1)</string>
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml
...@@ -521,6 +521,10 @@ ...@@ -521,6 +521,10 @@
<string name="msg_help_360_move">이 버튼을 누르면 작업 코드 버튼의 이동이 가능하게 됩니다.</string> <string name="msg_help_360_move">이 버튼을 누르면 작업 코드 버튼의 이동이 가능하게 됩니다.</string>
<string name="msg_help_360_touch">이 버튼을 누르면 작업 코드 버튼의 탭이 가능하게 되므로 보고 화면 표시가 가능하게 됩니다.</string> <string name="msg_help_360_touch">이 버튼을 누르면 작업 코드 버튼의 탭이 가능하게 되므로 보고 화면 표시가 가능하게 됩니다.</string>
<!-- 1.1.0 -->
<string name="operation_category">カテゴリ</string>
<string name="type_all">全て</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
<string name="meetingroom_setting_1">회의실 설정(1)</string> <string name="meetingroom_setting_1">회의실 설정(1)</string>
......
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -525,6 +525,10 @@ ...@@ -525,6 +525,10 @@
<string name="msg_help_360_move">Press this button to move the work code label.</string> <string name="msg_help_360_move">Press this button to move the work code label.</string>
<string name="msg_help_360_touch">If you press this button, you will be able to touch the work code button, so you can report the work.</string> <string name="msg_help_360_touch">If you press this button, you will be able to touch the work code button, so you can report the work.</string>
<!-- 1.1.0 -->
<string name="operation_category">カテゴリ</string>
<string name="type_all">全て</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
<string name="meetingroom_setting_1">Meeting room setting(1)</string> <string name="meetingroom_setting_1">Meeting room setting(1)</string>
......
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/btn_view_mode" android:layout_toRightOf="@+id/btn_view_mode"
android:onClick="onClickOperationFilterList" android:onClick="onClickOperationFilterList"
android:background="@drawable/ic_filter" /> android:background="@drawable/ic_filter" />
...@@ -37,67 +37,52 @@ ...@@ -37,67 +37,52 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/icon_filter" android:layout_toRightOf="@+id/icon_filter"
android:background="@drawable/ic_operation_search" /> android:background="@drawable/ic_operation_search" />
<RadioGroup <RadioGroup
android:id="@+id/segment_group" android:id="@+id/segment_group"
android:layout_width="150dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="30dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/btn_search" android:layout_toRightOf="@+id/btn_search"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="visible"> android:visibility="visible">
<RadioButton <RadioButton
android:id="@+id/operation_location_type_all" android:id="@+id/operation_location_type_all"
android:layout_width="wrap_content" android:layout_width="80dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:background="@drawable/operation_location_segment_background"
android:background="@drawable/radio_left"
android:button="@null" android:button="@null"
android:checked="true" android:checked="true"
android:gravity="center" android:gravity="center"
android:onClick="onClickOperationLocationType" android:onClick="onClickOperationLocationType"
android:text="全て" android:textColor="@drawable/operation_location_text_color"
android:textColor="@color/operation_default_text_color" android:text="@string/type_all"
android:textStyle="bold" /> android:textStyle="bold" />
<RadioButton <RadioButton
android:id="@+id/operation_location_type_group" android:id="@+id/operation_location_type_group"
android:layout_width="wrap_content" android:layout_width="80dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:background="@drawable/operation_location_segment_background"
android:background="@drawable/radio_right"
android:button="@null" android:button="@null"
android:gravity="center" android:gravity="center"
android:onClick="onClickOperationLocationType" android:onClick="onClickOperationLocationType"
android:text="カテゴリ" android:textColor="@drawable/operation_location_text_color"
android:textColor="@color/operation_default_text_color" android:text="@string/operation_category"
android:textStyle="bold" /> android:textStyle="bold" />
</RadioGroup> </RadioGroup>
<TextView
android:id="@+id/title"
style="@style/DialogToolBarTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="@string/operation_list"
android:textColor="@color/text_dialog"
android:textSize="15dp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/search_result" android:id="@+id/search_result"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="10dp" android:layout_marginRight="15dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_toLeftOf="@+id/btn_communication_menu" android:layout_toLeftOf="@+id/btn_communication_menu"
android:background="@drawable/radius_frame" android:background="@drawable/radius_frame"
...@@ -123,7 +108,7 @@ ...@@ -123,7 +108,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="10dp" android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_sub_menu" android:layout_toLeftOf="@+id/btn_sub_menu"
android:background="@drawable/ic_communication_menu" /> android:background="@drawable/ic_communication_menu" />
...@@ -132,7 +117,7 @@ ...@@ -132,7 +117,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="10dp" android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_common_content" android:layout_toLeftOf="@+id/btn_common_content"
android:background="@drawable/ic_operation_setting" android:background="@drawable/ic_operation_setting"
android:onClick="onClickOperationSubMenu" /> android:onClick="onClickOperationSubMenu" />
...@@ -142,7 +127,7 @@ ...@@ -142,7 +127,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="10dp" android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/btn_help" android:layout_toLeftOf="@+id/btn_help"
android:background="@drawable/ic_common_content_off" /> android:background="@drawable/ic_common_content_off" />
......
ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
...@@ -31,34 +31,41 @@ ...@@ -31,34 +31,41 @@
android:onClick="onClickOperationFilterList" android:onClick="onClickOperationFilterList"
android:src="@drawable/ic_filter" /> android:src="@drawable/ic_filter" />
<ImageButton <RadioGroup
android:id="@+id/icon_operation_group_master" android:id="@+id/segment_group"
style="@style/ToolBarIcon" android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10dp" android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/icon_filter" android:layout_toRightOf="@+id/icon_filter"
android:src="@drawable/ic_filter" android:orientation="horizontal"
android:visibility="gone"/> android:visibility="visible">
<LinearLayout <RadioButton
android:layout_width="wrap_content" android:id="@+id/operation_location_type_all"
android:layout_height="wrap_content" android:layout_width="80dp"
android:layout_centerHorizontal="true" android:layout_height="match_parent"
android:layout_centerVertical="true"> android:background="@drawable/operation_location_segment_background"
android:button="@null"
<TextView android:checked="true"
android:id="@+id/title" android:gravity="center"
style="@style/DialogToolBarTitle" android:onClick="onClickOperationLocationType"
android:layout_width="wrap_content" android:textColor="@drawable/operation_location_text_color"
android:layout_height="wrap_content" android:text="@string/type_all"
android:text="@string/operation_list"
android:layout_marginRight="25dp"
android:layout_centerVertical="true"
android:textColor="@color/text_dialog"
android:visibility="visible"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> <RadioButton
android:id="@+id/operation_location_type_group"
android:layout_width="80dp"
android:layout_height="match_parent"
android:background="@drawable/operation_location_segment_background"
android:button="@null"
android:gravity="center"
android:onClick="onClickOperationLocationType"
android:textColor="@drawable/operation_location_text_color"
android:text="@string/operation_category"
android:textStyle="bold" />
</RadioGroup>
<ImageButton <ImageButton
android:id="@+id/btn_common_content" android:id="@+id/btn_common_content"
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
...@@ -144,7 +144,6 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -144,7 +144,6 @@ public class OperationListActivity extends ABVUIActivity {
private TextView mStartDate; private TextView mStartDate;
private TextView mEndDate; private TextView mEndDate;
private LinearLayout mSearchResultLayout; private LinearLayout mSearchResultLayout;
private TextView mTitleView;
private LinearLayout mReportTypeLayoutLabel; private LinearLayout mReportTypeLayoutLabel;
private LinearLayout mReportTypeLayoutButton; private LinearLayout mReportTypeLayoutButton;
...@@ -235,16 +234,11 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -235,16 +234,11 @@ public class OperationListActivity extends ABVUIActivity {
mFilterButton = (ImageButton) findViewById(R.id.icon_filter); mFilterButton = (ImageButton) findViewById(R.id.icon_filter);
mSearchResultLayout = (LinearLayout) findViewById(R.id.search_result); mSearchResultLayout = (LinearLayout) findViewById(R.id.search_result);
mTitleView = (TextView) findViewById(R.id.title);
mCommunicationButton = (ImageButton) findViewById(R.id.btn_communication_menu); mCommunicationButton = (ImageButton) findViewById(R.id.btn_communication_menu);
mCommonContentButton = (ImageButton) findViewById(R.id.btn_common_content); mCommonContentButton = (ImageButton) findViewById(R.id.btn_common_content);
mLocationTypeRadioGroup = (RadioGroup) findViewById(R.id.segment_group); mLocationTypeRadioGroup = (RadioGroup) findViewById(R.id.segment_group);
// 作業一覧のタイトルパータンでセット // ビュー変更ボタンのタッチイベント
mTitleView.setText(PatternStringUtil.patternToString(getApplicationContext(),
R.string.operation_list,
getUserPref(AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)));
mViewModeButton.setOnClickListener(new View.OnClickListener() { mViewModeButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -281,6 +275,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -281,6 +275,7 @@ public class OperationListActivity extends ABVUIActivity {
mSelectedFixPuchMessagePosition = 0; mSelectedFixPuchMessagePosition = 0;
mSendType = 0; mSendType = 0;
// コミュニケーションボタン
mCommunicationButton.setOnClickListener(new View.OnClickListener() { mCommunicationButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -288,6 +283,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -288,6 +283,7 @@ public class OperationListActivity extends ABVUIActivity {
} }
}); });
// 共通関連資料ボタン
mCommonContentButton.setOnClickListener(new View.OnClickListener() { mCommonContentButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -699,11 +695,9 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -699,11 +695,9 @@ public class OperationListActivity extends ABVUIActivity {
if (StringUtil.isNullOrEmpty(mSearchWord) && StringUtil.isNullOrEmpty(mStartDateStr) && StringUtil.isNullOrEmpty(mEndDateStr)) { if (StringUtil.isNullOrEmpty(mSearchWord) && StringUtil.isNullOrEmpty(mStartDateStr) && StringUtil.isNullOrEmpty(mEndDateStr)) {
// 検索ワードが存在しない場合、検索結果ではないので非表示 // 検索ワードが存在しない場合、検索結果ではないので非表示
mSearchResultLayout.setVisibility(View.GONE); mSearchResultLayout.setVisibility(View.GONE);
mTitleView.setVisibility(View.VISIBLE);
} else { } else {
// 検索ワードが存在するため、検索結果と見做し、表示 // 検索ワードが存在するため、検索結果と見做し、表示
mSearchResultLayout.setVisibility(View.VISIBLE); mSearchResultLayout.setVisibility(View.VISIBLE);
mTitleView.setVisibility(View.GONE);
} }
} }
...@@ -1251,7 +1245,7 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -1251,7 +1245,7 @@ public class OperationListActivity extends ABVUIActivity {
mOperationLogic.sendPanoContent(operationDto.operationId, operationDto.operationName, file); mOperationLogic.sendPanoContent(operationDto.operationId, operationDto.operationName, file);
isError = false; isError = false;
} catch (ABVException e) { } catch (ABVException e) {
//noroutineion EnumSwitchStatementWhichMissesCases //noinspection EnumSwitchStatementWhichMissesCases
switch (e.getCode()) { switch (e.getCode()) {
case P_E_ACMS_P001: case P_E_ACMS_P001:
showSimpleAlertDialog(R.string.app_name, showSimpleAlertDialog(R.string.app_name,
...@@ -2131,12 +2125,12 @@ public class OperationListActivity extends ABVUIActivity { ...@@ -2131,12 +2125,12 @@ public class OperationListActivity extends ABVUIActivity {
} }
/** /**
* 全て・作業種別セグメントのクリックイベント * セグメント（全て・カテゴリ）のクリックイベント
* @param view * @param view
*/ */
public void onClickOperationLocationType(View view) { public void onClickOperationLocationType(View view) {
if (view.getId() == R.id.operation_location_type_group) { if (view.getId() == R.id.operation_location_type_group) {
// 種別モード // カテゴリ
getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.GROUP); getABVUIDataCache().setOperationGroupMasterMode(OperationLocationType.GROUP);
} else { } else {
// 全て // 全て
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java
...@@ -84,10 +84,15 @@ public class OperationGroupMasterListHelper extends HierarchyOperationListHelper ...@@ -84,10 +84,15 @@ public class OperationGroupMasterListHelper extends HierarchyOperationListHelper
// 作業種別の選択画面を閉じる // 作業種別の選択画面を閉じる
mAppActivity.closeOperationGroupMasterDialog(); mAppActivity.closeOperationGroupMasterDialog();
} }
// 作業種別IDで紐づく作業リストを取得
return mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(operationGroupMasterId); return mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(operationGroupMasterId);
} }
/**
* 親階層へ移動処理
* @param popCount いくつ上の階層を表示するか指定します。
* @param isReload リロードする・しない判定
*/
@Override @Override
public void popList(int popCount, boolean isReload) { public void popList(int popCount, boolean isReload) {
for (int i = 0; i < popCount; i++) { for (int i = 0; i < popCount; i++) {
......
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