Commit 833c99f1 by onuma

作業報告(追加・変更)画面では、IO帳票アイコンを非表示にした。

parent 1b821011
...@@ -122,6 +122,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity { ...@@ -122,6 +122,8 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
protected Button operationHomeButton; protected Button operationHomeButton;
protected ImageButton taskListButton; protected ImageButton taskListButton;
protected ImageButton helpButton; protected ImageButton helpButton;
// 簡易帳票印刷ボタン
protected ImageButton printButton;
protected boolean isPageFinished; protected boolean isPageFinished;
protected Double latitude; protected Double latitude;
......
...@@ -86,8 +86,6 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -86,8 +86,6 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
private ImageButton reloadButton; private ImageButton reloadButton;
private ImageButton downloadButton; private ImageButton downloadButton;
// 簡易帳票印刷ボタン
private ImageButton printButton;
private int objectLogId; private int objectLogId;
private WebView webView; private WebView webView;
...@@ -382,7 +380,6 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -382,7 +380,6 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
} }
}); });
printButton = (ImageButton) findViewById(R.id.btn_print);
printButton.setOnClickListener(new View.OnClickListener() { printButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -741,6 +738,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity { ...@@ -741,6 +738,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
/** /**
* 簡易帳票印刷ボタン活性制御 * 簡易帳票印刷ボタン活性制御
* 簡易帳票区分が1のデータが存在する場合表示、それ以外非表示 * 簡易帳票区分が1のデータが存在する場合表示、それ以外非表示
* これとは別に、ヘルプボタンが非表示になる時に必ず非表示になる。
*/ */
private void printButtonActivityControl() { private void printButtonActivityControl() {
OperationDto operation = mOperationDao.getOperation(mOperationId); OperationDto operation = mOperationDao.getOperation(mOperationId);
......
...@@ -82,6 +82,7 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity { ...@@ -82,6 +82,7 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity {
btnWebBack = (Button) findViewById(R.id.btnWebBack); btnWebBack = (Button) findViewById(R.id.btnWebBack);
btnWebForward = (Button) findViewById(R.id.btnWebForward); btnWebForward = (Button) findViewById(R.id.btnWebForward);
m_progress = (ProgressBar) findViewById(R.id.refresh_prog); m_progress = (ProgressBar) findViewById(R.id.refresh_prog);
printButton = (ImageButton) findViewById(R.id.btn_print);
btnLinkOriginalBack = (Button) findViewById(R.id.btn_link_original_back); btnLinkOriginalBack = (Button) findViewById(R.id.btn_link_original_back);
...@@ -134,8 +135,11 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity { ...@@ -134,8 +135,11 @@ public class ParentWebViewActivity extends ABVCheckContentViewActivity {
protected void commonConfigureHeader() { protected void commonConfigureHeader() {
if (mStatusCode == Constant.XWalkWebViewDisplayStatus.InitView) { //フォームが非表示時のみヘルプボタン表示 if (mStatusCode == Constant.XWalkWebViewDisplayStatus.InitView) { //フォームが非表示時のみヘルプボタン表示
helpButton.setVisibility(View.VISIBLE); helpButton.setVisibility(View.VISIBLE);
printButton.setVisibility(View.VISIBLE);
} else { } else {
helpButton.setVisibility(View.INVISIBLE); helpButton.setVisibility(View.INVISIBLE);
printButton.setVisibility(View.INVISIBLE); // ヘルプボタンを表示しない時、IO帳票ボタンも表示しない。
} }
if (Constant.XWalkWebViewDisplayStatus.TaskView == mStatusCode) { if (Constant.XWalkWebViewDisplayStatus.TaskView == mStatusCode) {
......
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