Commit bdf86aec by Kim Eunchul

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

parent bb0544ca
......@@ -158,8 +158,6 @@ 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,12 +140,12 @@
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:background="@drawable/btn_operation_print_white"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:scaleX="0.6"
......
......@@ -747,17 +747,10 @@ 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);
intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision) + "?isNative=1");
intent.putExtra("operationId", mOperationId);
startActivity(intent, NaviConsts.Right);
}
......
......@@ -713,7 +713,7 @@ public class HTMLWebViewActivity extends ParentWebViewActivity {
Intent intent = new Intent();
intent.setClass(HTMLWebViewActivity.this, OnlineHTMLWebViewActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision));
intent.putExtra("LINKURL", AcmsApis.getApiUrl(ABVEnvironment.getInstance().acmsAddress, ABVDataCache.getInstance().getUrlPath(), AcmsApis.ApiQuickReportRevision) + "?isNative=1");
intent.putExtra("operationId", mOperationId);
startActivity(intent, NaviConsts.Right);
}
......
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