Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
908bccb6
Commit
908bccb6
authored
Sep 18, 2019
by
Lee Jaebin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ソート順のデフォルト値変更「作業期間が新しい順」
parent
caef5b16
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
14 deletions
+12
-14
ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/ABVUIDataCache.java
+2
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+8
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/HomeOperationListHelper.java
+1
-8
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java
+1
-4
No files found.
ABVJE_UI_Android/src/jp/agentec/abook/abv/launcher/android/ABVUIDataCache.java
View file @
908bccb6
...
...
@@ -124,10 +124,10 @@ public class ABVUIDataCache {
/**
* ソート条件を取得
* @return ソートタイプ(デフォルト :
0
)
* @return ソートタイプ(デフォルト :
1(作業期間が新しい順)
)
*/
public
int
getSortCondition
()
{
return
PreferenceUtil
.
getUserPref
(
context
,
UserPrefKey
.
OPERATION_SORT_CONDITION
,
0
);
return
PreferenceUtil
.
getUserPref
(
context
,
UserPrefKey
.
OPERATION_SORT_CONDITION
,
1
);
}
/**
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
908bccb6
...
...
@@ -1977,4 +1977,12 @@ public class OperationListActivity extends ABVUIActivity {
showOperationGroupMasterDialog
(
true
);
}
}
/**
* ソート順取得(デフォルト:1(作業期間が新しい順))
* @return
*/
public
int
getSortCondition
()
{
return
getABVUIDataCache
().
getSortCondition
();
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/HomeOperationListHelper.java
View file @
908bccb6
...
...
@@ -3,16 +3,9 @@ package jp.agentec.abook.abv.ui.home.helper;
import
java.util.List
;
import
jp.agentec.abook.abv.bl.acms.type.OperationSortingType
;
import
jp.agentec.abook.abv.bl.common.log.Logger
;
import
jp.agentec.abook.abv.bl.dto.ContentDto
;
import
jp.agentec.abook.abv.bl.dto.OperationDto
;
import
jp.agentec.abook.abv.bl.logic.AbstractLogic
;
import
jp.agentec.abook.abv.bl.logic.OperationLogic
;
import
jp.agentec.abook.abv.ui.common.appinfo.AppDefType
;
import
jp.agentec.abook.abv.ui.home.activity.OperationListActivity
;
import
static
jp
.
agentec
.
abook
.
abv
.
cl
.
util
.
PreferenceUtil
.
getUserPref
;
/**
* Created by leej on 2019/06/24.
*/
...
...
@@ -27,7 +20,7 @@ public class HomeOperationListHelper extends OperationListHelper {
@Override
protected
List
<
OperationDto
>
findOperationList
()
throws
Exception
{
int
operationSortType
=
getUserPref
(
mAppActivity
,
AppDefType
.
UserPrefKey
.
OPERATION_SORT_CONDITION
,
0
);
int
operationSortType
=
mAppActivity
.
getSortCondition
(
);
OperationSortingType
operationSortingType
=
OperationSortingType
.
parse
(
operationSortType
);
return
operationLogic
.
getRefreshOperation
(
mAppActivity
.
mSearchWord
,
mAppActivity
.
mStartDateStr
,
mAppActivity
.
mEndDateStr
,
operationSortingType
);
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java
View file @
908bccb6
...
...
@@ -12,12 +12,9 @@ import jp.agentec.abook.abv.bl.dto.OperationGroupMasterDto;
import
jp.agentec.abook.abv.bl.logic.AbstractLogic
;
import
jp.agentec.abook.abv.bl.logic.OperationGroupMasterLogic
;
import
jp.agentec.abook.abv.launcher.android.ABVApplication
;
import
jp.agentec.abook.abv.ui.common.appinfo.AppDefType
;
import
jp.agentec.abook.abv.ui.home.activity.OperationListActivity
;
import
jp.agentec.adf.util.CollectionUtil
;
import
static
jp
.
agentec
.
abook
.
abv
.
cl
.
util
.
PreferenceUtil
.
getUserPref
;
public
class
OperationGroupMasterListHelper
extends
CategoryOperationListHelper
<
OperationGroupMasterDto
>
{
private
static
final
String
TAG
=
"OperationGroupMasterListHelper"
;
...
...
@@ -76,7 +73,7 @@ public class OperationGroupMasterListHelper extends CategoryOperationListHelper<
OperationGroupMasterDto
peekOperationGroupMasterDto
=
stack
.
peek
();
mAppActivity
.
checkBatchNeedSyncButton
(
peekOperationGroupMasterDto
.
operationGroupMasterId
);
int
operationSortType
=
getUserPref
(
mAppActivity
,
AppDefType
.
UserPrefKey
.
OPERATION_SORT_CONDITION
,
0
);
int
operationSortType
=
mAppActivity
.
getSortCondition
(
);
OperationSortingType
operationSortingType
=
OperationSortingType
.
parse
(
operationSortType
);
// 作業種別IDで紐づく作業リストを取得
return
mOperationGroupMasterLogic
.
getOperationByOperationGroupMasterId
(
peekOperationGroupMasterDto
.
operationGroupMasterId
,
operationSortingType
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment