Skip to content

A
abook_check
Commit 313c6077 by Lee Jaebin
Options

#34868 作業種別改善

parent 5d60379c
Showing with 44 additions and 16 deletions
ABVJE_Res_Default_Android/res/values-ja/strings.xml
...@@ -519,10 +519,6 @@ ...@@ -519,10 +519,6 @@
<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.2.0 --> <!-- 1.2.0 -->
<string name="msg_operation_enable_meeting_room_connected">会議室入室中の為、このボタンは利用できません。\n共通資料画面から資料を選択してください。</string> <string name="msg_operation_enable_meeting_room_connected">会議室入室中の為、このボタンは利用できません。\n共通資料画面から資料を選択してください。</string>
<string name="batch_sync">一括同期</string> <string name="batch_sync">一括同期</string>
...@@ -533,6 +529,9 @@ ...@@ -533,6 +529,9 @@
<string name="msg_batch_sync_new_content_updating">新着更新処理中の為、一括同期できません。</string> <string name="msg_batch_sync_new_content_updating">新着更新処理中の為、一括同期できません。</string>
<string name="msg_batch_sync_error">「%1$s」の同期に失敗しました。同期処理を中止します。\n</string> <string name="msg_batch_sync_error">「%1$s」の同期に失敗しました。同期処理を中止します。\n</string>
<string name="msg_batch_sync_move_operation_view">一括同期中には点検作業報告画面へ遷移できません。</string> <string name="msg_batch_sync_move_operation_view">一括同期中には点検作業報告画面へ遷移できません。</string>
<string name="select_category">カテゴリ選択</string>
<string name="title_category">カテゴリ</string>
<string name="title_all_operation">全作業</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml
...@@ -521,10 +521,6 @@ ...@@ -521,10 +521,6 @@
<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.2.0 --> <!-- 1.2.0 -->
<string name="msg_operation_enable_meeting_room_connected">회의실 접속 중에는 이 버튼을 사용하실수 없습니다. \n공통자료화면에서 자료를 선택해 주세요.</string> <string name="msg_operation_enable_meeting_room_connected">회의실 접속 중에는 이 버튼을 사용하실수 없습니다. \n공통자료화면에서 자료를 선택해 주세요.</string>
<string name="batch_sync">일괄 동기</string> <string name="batch_sync">일괄 동기</string>
...@@ -535,6 +531,9 @@ ...@@ -535,6 +531,9 @@
<string name="msg_batch_sync_new_content_updating">새로운 정보갱신 중에는 일괄 동기을 하실 수 없습니다.</string> <string name="msg_batch_sync_new_content_updating">새로운 정보갱신 중에는 일괄 동기을 하실 수 없습니다.</string>
<string name="msg_batch_sync_error">「%1$s」정보갱신에 실패하였습니다. 동기처리을 중지합니다.\n</string> <string name="msg_batch_sync_error">「%1$s」정보갱신에 실패하였습니다. 동기처리을 중지합니다.\n</string>
<string name="msg_batch_sync_move_operation_view">일괄 동기 처리 중에는 점검작업 보고화면으로 이동하실 수 없습니다.</string> <string name="msg_batch_sync_move_operation_view">일괄 동기 처리 중에는 점검작업 보고화면으로 이동하실 수 없습니다.</string>
<string name="select_category">カテゴリ選択</string>
<string name="title_category">カテゴリ</string>
<string name="title_all_operation">全作業</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
......
ABVJE_Res_Default_Android/res/values/strings.xml
...@@ -525,10 +525,7 @@ ...@@ -525,10 +525,7 @@
<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 --> <!-- 1.2.0 -->
<string name="operation_category">Category</string>
<string name="type_all">All</string>
<string name="msg_operation_enable_meeting_room_connected">Because you are in a conference room, this button is not available right now. \n Please select the document from common document</string> <string name="msg_operation_enable_meeting_room_connected">Because you are in a conference room, this button is not available right now. \n Please select the document from common document</string>
<string name="batch_sync">batch sync</string> <string name="batch_sync">batch sync</string>
<string name="batch_syncing">batch syncing...</string> <string name="batch_syncing">batch syncing...</string>
...@@ -538,6 +535,9 @@ ...@@ -538,6 +535,9 @@
<string name="msg_batch_sync_new_content_updating">Batch synchronization can not be performed because new data is being updated.</string> <string name="msg_batch_sync_new_content_updating">Batch synchronization can not be performed because new data is being updated.</string>
<string name="msg_batch_sync_error">「%1$s」 failed. Cancel synchronization processing.\n</string> <string name="msg_batch_sync_error">「%1$s」 failed. Cancel synchronization processing.\n</string>
<string name="msg_batch_sync_move_operation_view">You can not transition to the inspection work report screen because you are in a batch synchronization.</string> <string name="msg_batch_sync_move_operation_view">You can not transition to the inspection work report screen because you are in a batch synchronization.</string>
<string name="select_category">カテゴリ選択</string>
<string name="title_category">カテゴリ</string>
<string name="title_all_operation">全作業</string>
<!-- 1.0.1 Resource Pattern 1 --> <!-- 1.0.1 Resource Pattern 1 -->
<!-- 1.9.0.0--> <!-- 1.9.0.0-->
......
ABVJE_UI_Android/res/layout/item_dialog_list.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="50dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center_vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:textColor="@color/text_select"
android:text="@string/dummy_str"
/>
\ No newline at end of file
ABVJE_UI_Android/res/layout/popup_simple_list.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:id="@+id/LinearLayout1" android:id="@+id/LinearLayout1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/mydata_bg" android:background="@color/operation_color"
android:orientation="vertical" > android:orientation="vertical" >
<RelativeLayout <RelativeLayout
......
ABVJE_UI_Android/res/values-ja/arrays.xml
...@@ -8,4 +8,9 @@ ...@@ -8,4 +8,9 @@
<item>報告タイプ順</item> <item>報告タイプ順</item>
<item>閲覧日が新しい順</item> <item>閲覧日が新しい順</item>
</string-array> </string-array>
<string-array name="category_types">
<item>全て</item>
<item>カテゴリ</item>
</string-array>
</resources> </resources>
\ No newline at end of file
ABVJE_UI_Android/res/values-ko/arrays.xml
...@@ -8,4 +8,9 @@ ...@@ -8,4 +8,9 @@
        <item>보고타입</item>         <item>보고타입</item>
        <item>열람최신순</item>         <item>열람최신순</item>
</string-array> </string-array>
<string-array name="category_types">
<item>전체</item>
<item>분류</item>
</string-array>
</resources> </resources>
ABVJE_UI_Android/res/values/arrays.xml
...@@ -9,4 +9,9 @@ ...@@ -9,4 +9,9 @@
<item>Order by operation Type</item> <item>Order by operation Type</item>
<item>Order by browse date(descend)</item> <item>Order by browse date(descend)</item>
</string-array> </string-array>
<string-array name="category_types">
<item>All</item>
<item>Category</item>
</string-array>
</resources> </resources>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java
...@@ -15,7 +15,7 @@ public interface AppDefType { ...@@ -15,7 +15,7 @@ public interface AppDefType {
// 作業種別モードフラグ // 作業種別モードフラグ
interface OperationLocationType { interface OperationLocationType {
int ALL = 0; int ALL = 0;
int GROUP = 1; int CATEGORY = 1;
} }
interface DefPrefKey { interface DefPrefKey {
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/view/ABVPopupListWindow.java
...@@ -164,7 +164,7 @@ public class ABVPopupListWindow extends PopupWindow { ...@@ -164,7 +164,7 @@ public class ABVPopupListWindow extends PopupWindow {
int maxWidth = 0; int maxWidth = 0;
View view = null; View view = null;
FrameLayout fakeParent = new FrameLayout(context); FrameLayout fakeParent = new FrameLayout(context);
for (int i=0, count=adapter.getCount(); i<count; i++) { for (int i = 0, count = adapter.getCount(); i < count; i++) {
view = adapter.getView(i, view, fakeParent); view = adapter.getView(i, view, fakeParent);
view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int width = view.getMeasuredWidth(); int width = view.getMeasuredWidth();
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/HierarchyOperationListHelper.java
...@@ -56,7 +56,7 @@ public abstract class HierarchyOperationListHelper<StackObject> extends Operatio ...@@ -56,7 +56,7 @@ public abstract class HierarchyOperationListHelper<StackObject> extends Operatio
panListLayout.findViewById(R.id.btn_show_list_view).setOnClickListener(new OnClickListener() { panListLayout.findViewById(R.id.btn_show_list_view).setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mAppActivity.showOperationGroupMasterDialog(true,false); mAppActivity.showOperationGroupMasterDialog(true);
} }
}); });
......
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