Commit bb0544ca by Kim Eunchul

#42998 I/O 帳票出力画面改善

parent beaf139b
......@@ -158,6 +158,8 @@ public class AcmsApis {
public static final String ApiGetApertureMasterData = "getApertureMasterData";
// 簡易帳票一覧取得
public static final String ApiQuickReportSearch = "quickReportSearch";
public static final String ApiQuickReportPrint = "quickReportRevisionByOperation/revisionByOperationSearch/";
// 簡易帳票リビジョン一覧取得
public static final String ApiQuickReportRevision = "quickReportRevision";
......
......@@ -140,6 +140,20 @@
android:layout_centerVertical="true"
android:layout_marginRight="4dp"
android:background="@drawable/btn_view_sub_menu" />
<ImageButton
android:id="@+id/btn_operation_print"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/btn_operation_print"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:scaleX="0.6"
android:scaleY="0.6"
style="@style/ToolBarIcon"
android:layout_marginRight="50dp"
android:visibility="gone" />
<ImageButton
android:id="@+id/btn_show_task_list"
......
......@@ -80,6 +80,9 @@ import jp.agentec.abook.abv.ui.viewer.activity.HTMLXWalkWebViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.NoPdfViewActivity;
import jp.agentec.abook.abv.ui.viewer.activity.PhotoEditActivity;
import jp.agentec.abook.abv.ui.viewer.foxitPdf.FoxitPdfCore;
import jp.agentec.abook.abv.bl.acms.type.AcmsApis;
import jp.agentec.abook.abv.ui.viewer.activity.OnlineHTMLWebViewActivity;
import jp.agentec.abook.abv.ui.common.constant.NaviConsts;
import jp.agentec.adf.util.DateTimeUtil;
import jp.agentec.adf.util.FileUtil;
import jp.agentec.adf.util.StringUtil;
......@@ -127,6 +130,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
protected TextView operationNameTitle;
protected ImageButton operationHomeButton;
protected ImageButton taskListButton;
protected ImageButton quickReportPrintButton;
// protected ImageButton helpButton;
protected boolean isPageFinished;
......@@ -665,6 +669,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
}
fl.setBackgroundColor(getResources().getColor(R.color.operation_color));
operationHomeButton = (ImageButton) findViewById(R.id.btn_operation_home);
quickReportPrintButton = (ImageButton) findViewById(R.id.btn_operation_print);
operationHomeButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -678,6 +683,23 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
}
});
operationHomeButton.setVisibility(View.VISIBLE);
if(operationDto.operationType == OperationType.PDF){
// 簡易帳票印刷ボタン
quickReportPrintButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showPrintTargetSelect(operationDto);
}
});
if (ABVDataCache.getInstance().serviceOption.isUnableIOReport()) {
quickReportPrintButton.setVisibility(View.VISIBLE);
} else {
findViewById(R.id.print_layout).setVisibility(View.GONE);
quickReportPrintButton.setVisibility(View.GONE);
}
}
taskListButton = (ImageButton) findViewById(R.id.btn_show_task_list);
taskListButton.setOnClickListener(new View.OnClickListener() {
......@@ -720,6 +742,26 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
}
}
/**
* 簡易帳票印刷対象選択画面表示
*/
private void showPrintTargetSelect(OperationDto operationDto) {
Intent intent = new Intent();
StringBuffer path = new StringBuffer();
path.append(ABVEnvironment.getInstance().acmsAddress);
path.append(ABVDataCache.getInstance().getUrlPath()+ "/checkapi/");
path.append(AcmsApis.ApiQuickReportPrint);
path.append(operationDto.operationId + "/");
path.append(ABVDataCache.getInstance().getMemberInfo().sid);
path.append("?operationId=" + operationDto.operationId);
path.append("&sid=" + ABVDataCache.getInstance().getMemberInfo().sid);
intent.setClass(ABVContentViewActivity.this, OnlineHTMLWebViewActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.putExtra("LINKURL", "" + path);
startActivity(intent, NaviConsts.Right);
}
/**
* 360編集画面を閉じた時、呼び出す
*/
......
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