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

Merged
Opened Mar 30, 2023 by Kazuyuki Hida@hida-k 
  • Report abuse
Report abuse

カテゴリを絞った際にも、一時保存の件数を加算するようにした。

【@Form Android 1.3.1】作業一覧でカテゴリ表示にすると状況別件数表示に一時保存件数が反映されない https://redmine.agentec.jp/issues/52681 の対応。

Edited Mar 30, 2023 by Kazuyuki Hida
  • Discussion 1
  • Commits 1
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Mar 30, 2023
    Resolved by Yujin Seo Mar 30, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationGroupMasterListHelper.java
    82 84 // 報告 or 定期点検
    83 85 String reportTypeStr = getUserPref(mAppActivity, AppDefType.UserPrefKey.OPERATION_REPORT_TYPES, null);
    84 86
    85 return mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(peekOperationGroupMasterDto.operationGroupMasterId, reportTypeStr, operationSortingType);
    87 List<OperationDto> list = mOperationGroupMasterLogic.getOperationByOperationGroupMasterId(peekOperationGroupMasterDto.operationGroupMasterId, reportTypeStr, operationSortingType);
    88
    89 // ローカル保存している分を補正する
    90 WorkingReportDao dao = AbstractDao.getDao(WorkingReportDao.class);
    91 Map<Long, Integer> working = dao.getWorkingTaskReportCounts();
    92 for (OperationDto dto : list) {
    93 Integer workingCount = working.get(dto.operationId);
    94 if (workingCount != null) {
    95 dto.statusNotStartedCount += workingCount;
    96 }
    97 }
    98 return list;
    • Kazuyuki Hida @hida-k commented Mar 30, 2023
      Developer

      getOperationByOperationGroupMasterIdを直接返していたのを、ローカル保存の件数を補正してから返すようにしました。

      Edited Mar 30, 2023
      `getOperationByOperationGroupMasterId`を直接返していたのを、ローカル保存の件数を補正してから返すようにしました。
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    assigned to @seo

    Mar 30, 2023

    assigned to @seo

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

    unmarked as a Work In Progress

    Mar 30, 2023

    unmarked as a Work In Progress

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

    resolved all discussions

    Mar 30, 2023

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Yujin Seo @seo

    merged

    Mar 30, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit 333b2d9d

    Mar 30, 2023

    mentioned in commit 333b2d9d

    mentioned in commit 333b2d9d49ccef3cbdf6d2590752b3738215f859
    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!309
×

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.