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
af9a4be8
Commit
af9a4be8
authored
Aug 26, 2020
by
yuichiro ogawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
簡易帳票サービスオプション化対応
parent
40c6b41b
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
26 additions
and
2 deletions
+26
-2
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ServiceOption.java
+7
-0
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java
+4
-0
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
+1
-0
ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
+1
-0
ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
+1
-0
ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+5
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
+5
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
+1
-1
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ServiceOption.java
View file @
af9a4be8
...
@@ -158,5 +158,11 @@ public interface ServiceOption {
...
@@ -158,5 +158,11 @@ public interface ServiceOption {
* 利用しない:N(通常)、利用する:Y
* 利用しない:N(通常)、利用する:Y
*/
*/
int
AddUserPasswordSalt
=
181
;
int
AddUserPasswordSalt
=
181
;
/**
* I/O帳票使用
* 利用しない:N(通常)、利用する:Y
*/
int
UsableIOReport
=
186
;
}
}
}
}
\ No newline at end of file
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java
View file @
af9a4be8
...
@@ -336,6 +336,10 @@ public class ABVDataCache {
...
@@ -336,6 +336,10 @@ public class ABVDataCache {
return
isServiceOptionEnable
(
ServiceOptionId
.
PanoImage
);
return
isServiceOptionEnable
(
ServiceOptionId
.
PanoImage
);
}
}
public
boolean
isUnableIOReport
()
{
return
isServiceOptionEnable
(
ServiceOptionId
.
UsableIOReport
);
}
/**
/**
* @version 1.2.300
* @version 1.2.300
* サービスオプション(ユーザパスワードソルト付加)返す
* サービスオプション(ユーザパスワードソルト付加)返す
...
...
ABVJE_UI_Android/res/layout-large/ac_operation_list.xml
View file @
af9a4be8
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<LinearLayout
android:id=
"@+id/print_layout"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
...
...
ABVJE_UI_Android/res/layout-large/ac_operation_related_content.xml
View file @
af9a4be8
...
@@ -139,6 +139,7 @@
...
@@ -139,6 +139,7 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<LinearLayout
android:id=
"@+id/print_layout"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:layout_weight=
"1"
...
...
ABVJE_UI_Android/res/layout-normal/ac_operation_list.xml
View file @
af9a4be8
...
@@ -136,6 +136,7 @@
...
@@ -136,6 +136,7 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<LinearLayout
android:id=
"@+id/print_layout"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
...
ABVJE_UI_Android/res/layout-normal/ac_operation_related_content.xml
View file @
af9a4be8
...
@@ -129,6 +129,7 @@
...
@@ -129,6 +129,7 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<LinearLayout
android:id=
"@+id/print_layout"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
af9a4be8
...
@@ -259,6 +259,7 @@ public class OperationListActivity extends ABVUIActivity {
...
@@ -259,6 +259,7 @@ public class OperationListActivity extends ABVUIActivity {
}
}
});
});
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isUnableIOReport
())
{
// 簡易帳票印刷ボタン
// 簡易帳票印刷ボタン
mQuickReportPrintButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
mQuickReportPrintButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
...
@@ -267,6 +268,10 @@ public class OperationListActivity extends ABVUIActivity {
...
@@ -267,6 +268,10 @@ public class OperationListActivity extends ABVUIActivity {
}
}
});
});
mQuickReportPrintButton
.
setVisibility
(
View
.
VISIBLE
);
mQuickReportPrintButton
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
findViewById
(
R
.
id
.
print_layout
).
setVisibility
(
View
.
GONE
);
mQuickReportPrintButton
.
setVisibility
(
View
.
GONE
);
}
// 一括同期ボタン
// 一括同期ボタン
mOperationBatchSyncButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
mOperationBatchSyncButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationRelatedContentActivity.java
View file @
af9a4be8
...
@@ -109,8 +109,12 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
...
@@ -109,8 +109,12 @@ public class OperationRelatedContentActivity extends ABVUIActivity {
showCommunicationMenuDialog
();
showCommunicationMenuDialog
();
}
}
});
});
// 印刷ボタン活性化
if
(
ABVDataCache
.
getInstance
().
serviceOption
.
isUnableIOReport
())
{
mQuickReportPrintButton
.
setVisibility
(
View
.
VISIBLE
);
mQuickReportPrintButton
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
findViewById
(
R
.
id
.
print_layout
).
setVisibility
(
View
.
GONE
);
mQuickReportPrintButton
.
setVisibility
(
View
.
GONE
);
}
}
}
@Override
@Override
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
View file @
af9a4be8
...
@@ -623,7 +623,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
...
@@ -623,7 +623,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
*/
*/
private
void
printButtonActivityControl
()
{
private
void
printButtonActivityControl
()
{
OperationDto
operation
=
mOperationDao
.
getOperation
(
mOperationId
);
OperationDto
operation
=
mOperationDao
.
getOperation
(
mOperationId
);
if
(
operation
!=
null
&&
operation
.
quickReport
==
1
)
{
if
(
operation
!=
null
&&
operation
.
quickReport
==
1
&&
ABVDataCache
.
getInstance
().
serviceOption
.
isUnableIOReport
()
)
{
printButton
.
setVisibility
(
View
.
VISIBLE
);
printButton
.
setVisibility
(
View
.
VISIBLE
);
}
else
{
}
else
{
printButton
.
setVisibility
(
View
.
GONE
);
printButton
.
setVisibility
(
View
.
GONE
);
...
...
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