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
72c27988
Commit
72c27988
authored
Mar 12, 2019
by
Jeong Gilmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#32861_作業情報追加(Android)
- レビュー対応
parent
ac8c60d0
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
+2
-2
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
+1
-1
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
View file @
72c27988
...
@@ -118,7 +118,7 @@ public class ABookKeys {
...
@@ -118,7 +118,7 @@ public class ABookKeys {
public
static
final
String
OK
=
"OK"
;
public
static
final
String
OK
=
"OK"
;
// #32861 作業情報追加 start
// #32861 作業情報追加 start
public
static
final
String
REPORT_DRAFT
=
"localSave"
;
// 一時保存情報
public
static
final
String
LOCAL_SAVE
=
"localSave"
;
// 一時保存情報
public
static
final
String
ADD_REPORT
=
"addReport"
;
// 作業追加区分
public
static
final
String
ADD_REPORT
=
"addReport"
;
// 作業追加区分
public
static
final
String
CMD_LOCAL_SAVE_TASK_REPORT
=
"localSaveTaskReport"
;
// 一時保存
public
static
final
String
CMD_LOCAL_SAVE_TASK_REPORT
=
"localSaveTaskReport"
;
// 一時保存
// #32861 作業情報追加 end
// #32861 作業情報追加 end
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
View file @
72c27988
...
@@ -958,8 +958,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
...
@@ -958,8 +958,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
}
else
if
(
mCmd
.
equals
(
ABookKeys
.
CMD_SHOW_REPORT_OZD
))
{
}
else
if
(
mCmd
.
equals
(
ABookKeys
.
CMD_SHOW_REPORT_OZD
))
{
mReportFileName
=
abookCheckParam
.
get
(
ABookKeys
.
REPORT_FILE_NAME
);
mReportFileName
=
abookCheckParam
.
get
(
ABookKeys
.
REPORT_FILE_NAME
);
// #32861 作業情報追加 start
// #32861 作業情報追加 start
if
(
abookCheckParam
.
containsKey
(
ABookKeys
.
REPORT_DRAFT
))
{
if
(
abookCheckParam
.
containsKey
(
ABookKeys
.
LOCAL_SAVE
))
{
mLocalSave
=
Integer
.
parseInt
(
abookCheckParam
.
get
(
ABookKeys
.
REPORT_DRAFT
))
>
0
?
true
:
false
;
mLocalSave
=
Integer
.
parseInt
(
abookCheckParam
.
get
(
ABookKeys
.
LOCAL_SAVE
))
>
0
?
true
:
false
;
}
}
if
(
abookCheckParam
.
containsKey
(
ABookKeys
.
ADD_REPORT
))
{
if
(
abookCheckParam
.
containsKey
(
ABookKeys
.
ADD_REPORT
))
{
mAddReport
=
Integer
.
parseInt
(
abookCheckParam
.
get
(
ABookKeys
.
ADD_REPORT
))
>
0
?
true
:
false
;
mAddReport
=
Integer
.
parseInt
(
abookCheckParam
.
get
(
ABookKeys
.
ADD_REPORT
))
>
0
?
true
:
false
;
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ActivityHandlingHelper.java
View file @
72c27988
...
@@ -1562,7 +1562,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
...
@@ -1562,7 +1562,7 @@ public class ActivityHandlingHelper extends ABookHelper implements RemoteObserve
intent
.
putExtra
(
ABookKeys
.
REPORT_START_DATE
,
strReportStartDate
);
intent
.
putExtra
(
ABookKeys
.
REPORT_START_DATE
,
strReportStartDate
);
intent
.
putExtra
(
ABookKeys
.
REPORT_FILE_NAME
,
reportFileName
);
intent
.
putExtra
(
ABookKeys
.
REPORT_FILE_NAME
,
reportFileName
);
// #32861 作業情報追加 start
// #32861 作業情報追加 start
intent
.
putExtra
(
ABookKeys
.
REPORT_DRAFT
,
localSave
);
// 一時保存情報
intent
.
putExtra
(
ABookKeys
.
LOCAL_SAVE
,
localSave
);
// 一時保存情報
intent
.
putExtra
(
ABookKeys
.
ADD_REPORT
,
addReport
);
// 作業追加区分
intent
.
putExtra
(
ABookKeys
.
ADD_REPORT
,
addReport
);
// 作業追加区分
// #32861 作業情報追加 end
// #32861 作業情報追加 end
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/CheckOZDViewActivity.java
View file @
72c27988
...
@@ -118,7 +118,7 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
...
@@ -118,7 +118,7 @@ public class CheckOZDViewActivity extends ABVContentViewActivity {
// #32861 作業情報追加 start
// #32861 作業情報追加 start
// OZ閲覧画面に表示するボタン表示の可否設定
// OZ閲覧画面に表示するボタン表示の可否設定
// 一時保存情報についてボタン表示:「0:false、一時保存ボタン非表示」「1:ture、一時保存ボタン表示」
// 一時保存情報についてボタン表示:「0:false、一時保存ボタン非表示」「1:ture、一時保存ボタン表示」
mLocalSave
=
intent
.
getBooleanExtra
(
ABookKeys
.
REPORT_DRAFT
,
false
);
mLocalSave
=
intent
.
getBooleanExtra
(
ABookKeys
.
LOCAL_SAVE
,
false
);
// 作業追加区分についてボタンを表示:「0:false、作業追加区分なし、作業一覧へボタン」「1:ture、作業追加区分あり、閉じるボタン」
// 作業追加区分についてボタンを表示:「0:false、作業追加区分なし、作業一覧へボタン」「1:ture、作業追加区分あり、閉じるボタン」
mAadReport
=
intent
.
getBooleanExtra
(
ABookKeys
.
ADD_REPORT
,
false
);
mAadReport
=
intent
.
getBooleanExtra
(
ABookKeys
.
ADD_REPORT
,
false
);
...
...
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