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
  • !291

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

初回起動時に差戻のアイコンやメッセージが表示されない不具合を修正

insertの時に差戻やロックの情報を渡していなかった。

Edited Feb 21, 2023 by Kazuyuki Hida
  • Discussion 4
  • Commits 1
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 21, 2023
    Resolved by Yujin Seo Feb 21, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
    1061 1061 false,
    1062 1062 false,
    1063 1063 false,
    1064 serverTaskReportDto.getSendBackInfo(),
    1065 serverTaskReportDto.getLockInfo(),
    • Kazuyuki Hida @hida-k commented Feb 21, 2023
      Developer

      SendBackInfoとLockInfoを渡すようにした。

      Edited Feb 21, 2023
      SendBackInfoとLockInfoを渡すようにした。
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 21, 2023
    Resolved by Yujin Seo Feb 21, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
    398 398 attachedChangeFlag,
    399 399 localSavedFlg ? false : true,
    400 400 localSavedFlg,
    401 null,
    402 null,
    • Kazuyuki Hida @hida-k commented Feb 21, 2023
      Developer

      ここは、オペレータの「追加」操作で呼ばれるところなので、SendBackInfoとLockInfoはない

      Edited Feb 21, 2023
      ここは、オペレータの「追加」操作で呼ばれるところなので、SendBackInfoとLockInfoはない
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 21, 2023
    Resolved by Yujin Seo Feb 21, 2023
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
    306 306 boolean attachedChangeFlag,
    307 307 boolean dataSendFlg,
    308 308 boolean localSavedFlg,
    309 TaskReportDto.SendBackInfo sendBackInfo,
    310 TaskReportDto.LockInfo lockInfo,
    309 311 int taskStatus
    • Kazuyuki Hida @hida-k commented Feb 21, 2023
      Developer

      SendBackInfoとLockInfoを渡すようにした。

      Edited Feb 21, 2023
      SendBackInfoとLockInfoを渡すようにした。
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 21, 2023
    Resolved by Yujin Seo Feb 21, 2023
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
    337 339 if (localAttachedFileName != null) {
    338 340 taskReportDto.localAttachedFileName = localAttachedFileName;
    339 341 }
    342 if (sendBackInfo != null) {
    343 taskReportDto.sendBackUserId = sendBackInfo.sendBackUserId;
    344 taskReportDto.sendBackUserName = sendBackInfo.sendBackUserName;
    345 taskReportDto.sendBackComment = sendBackInfo.sendBackComment;
    346 }
    347 if (lockInfo != null) {
    348 taskReportDto.reportLockUserId = lockInfo.reportLockUserId;
    349 taskReportDto.reportLockUserName = lockInfo.reportLockUserName;
    350 taskReportDto.reportLockTime = lockInfo.reportLockTime;
    351 }
    • Kazuyuki Hida @hida-k commented Feb 21, 2023
      Developer

      渡されたSendBackInfoとLockInfoを使うようにした。

      Edited Feb 21, 2023
      渡されたSendBackInfoとLockInfoを使うようにした。
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    assigned to @seo

    Feb 21, 2023

    assigned to @seo

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

    unmarked as a Work In Progress

    Feb 21, 2023

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Yujin Seo @seo

    resolved all discussions

    Feb 21, 2023

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Yujin Seo @seo

    merged

    Feb 21, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit b25ef671

    Feb 21, 2023

    mentioned in commit b25ef671

    mentioned in commit b25ef6712bfa514b316e3f293fff22d7e99f98c6
    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
2
2 participants
Reference: abook_android/abook_check!291
×

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.