Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
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
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abook_android
  • abook_check
  • Merge Requests
  • !281

Merged
Opened Feb 15, 2023 by Kazuyuki Hida@hida-k 
  • Report abuse
Report abuse

I/O帳票のボタンの配置変更と英語でのタイトルを修正

I/O帳票の報告で、送信後、一覧に戻らないという問題が残っているが、別タスクとします。

Edited Feb 15, 2023 by Kazuyuki Hida
  • Discussion 4
  • Commits 1
  • Changes 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 15, 2023
    ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/parameters/UnlockReportParameters.java
    24 24
    25 25 this.taskKey = taskKey;
    26 26 this.taskReportId = taskReportId;
    27 this.reportStartDate = DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmssSSS_hyphen, "UTC");
    27 this.reportStartDate = DateTimeUtil.toStringInTimeZone(reportStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen, "UTC");
    28 28 }
    • Kazuyuki Hida @hida-k commented Feb 15, 2023
      Developer

      Dateの書式を間違えていたのを修正

      Dateの書式を間違えていたのを修正
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 15, 2023
    ABVJE_Res_Default_Android/res/values/strings.xml
    1447 1447 <!-- カテゴリ選択機能 -->
    1448 1448 <string name="no_child">No more data below.</string>
    1449 1449 <string name="title_category">Category</string>
    1450 <string name="title_all_operation">All</string>
    1450 <string name="title_all_operation">Operation List</string>
    1451 1451 <string name="category_list">Select Category</string>
    • Kazuyuki Hida @hida-k commented Feb 15, 2023
      Developer

      タイトルを変更

      タイトルを変更
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 15, 2023
    ABVJE_UI_Android/res/layout/ac_html_webview.xml
    200 189 android:layout_marginRight="10dp"
    201 190 android:visibility="gone"
    202 191 android:onClick="onClickShowHelpView"/>
    192 <ImageButton
    193 android:id="@+id/btn_print"
    194 android:layout_width="wrap_content"
    195 android:layout_height="wrap_content"
    196 android:background="@drawable/btn_operation_print_white"
    197 android:scaleX="0.6"
    198 android:scaleY="0.6"
    199 android:visibility="gone" />
    203 200 </LinearLayout>
    • Kazuyuki Hida @hida-k commented Feb 15, 2023
      Developer

      ボタンの配置変更

      ボタンの配置変更
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 15, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
    1003 1003 afterABookCheckApi(mCmd, mTaskKey, 0, "", extJson.toString(), isOperationPdf());
    1004 1004 } else if (mAddReport) { // 作業追加ありの場合
    1005 1005 // コールバック処理のみ行う。
    1006 afterABookCheckApi(mCmd, mTaskKey, 0, "", null, isOperationPdf());
    1006 String extParam = null;
    1007 if (mCmd.equals(ABookKeys.CMD_UNLOCK_REPORT)) {
    1008 extParam = "{'reportStatus':0, 'message':''}";
    1009 }
    1010 afterABookCheckApi(mCmd, mTaskKey, 0, "", extParam, isOperationPdf());
    1007 1011 } else {
    • Kazuyuki Hida @hida-k commented Feb 15, 2023
      Developer

      extParamを付けないとJSの方でエラーになるので、修正。

      extParamを付けないとJSの方でエラーになるので、修正。
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    assigned to @seo

    Feb 15, 2023

    assigned to @seo

    assigned to @seo
    Toggle commit list
  • Kazuyuki Hida @hida-k

    unmarked as a Work In Progress

    Feb 15, 2023

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Kazuyuki Hida @hida-k

    changed the description

    Feb 15, 2023

    changed the description

    changed the description
    Toggle commit list
  • takashi sasaki @sasaki-t

    merged

    Feb 15, 2023

    merged

    merged
    Toggle commit list
  • takashi sasaki @sasaki-t

    mentioned in commit 4cc7e141

    Feb 15, 2023

    mentioned in commit 4cc7e141

    mentioned in commit 4cc7e141a3f53a588908b9e1a3f52a345c8deaef
    Toggle commit list
  • Write
  • Preview
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 sign in to comment
Yujin Seo
Assignee
Yujin Seo @seo
Assign to
None
Milestone
None
Assign milestone
Time tracking
3
3 participants
Reference: abook_android/abook_check!281
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.