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

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

一時保存時にtaskStatusを設問に含まれる情報から取り出すようにした。

一時保存の際、

  • 状況の設問がない場合「完了」
  • 状況の設問がある場合「未実施」

とする。

という仕様に対して、状況の設問がない場合でも、状況の設問がある場合と同様に「q_3_」から始まる設問情報がわたってくるので、その値をtaskStatusとするようにした。

Edited Mar 20, 2023 by Kazuyuki Hida
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/contract/sato/1.0.300_52541_conpleted origin/feature/contract/sato/1.0.300_52541_conpleted

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout contract/sato/1.0.300
git merge --no-ff feature/contract/sato/1.0.300_52541_conpleted

Step 4. Push the result of the merge to GitLab

git push origin contract/sato/1.0.300

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 1
  • Commits 2
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida @hida-k

    marked as a Work In Progress

    Mar 20, 2023

    marked as a Work In Progress

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

    changed the description

    Mar 20, 2023

    changed the description

    changed the description
    Toggle commit list
  • Kazuyuki Hida @hida-k

    added 1 commit

    • 9002cb98 - 一時保存時にtaskStatusを設問に含まれる情報から取り出すタイミングを変えた

    Compare with previous version

    Mar 20, 2023

    added 1 commit

    • 9002cb98 - 一時保存時にtaskStatusを設問に含まれる情報から取り出すタイミングを変えた

    Compare with previous version

    added 1 commit * 9002cb98 - 一時保存時にtaskStatusを設問に含まれる情報から取り出すタイミングを変えた [Compare with previous version](https://gitlab.agentec.jp/abook_android/abook_check/merge_requests/308/diffs?diff_id=11137&start_sha=1c84e4cbcfa8b5e04ca664573bc6b7a4c311a825)
    Toggle commit list
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Mar 20, 2023
    Resolved by Yujin Seo Mar 20, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/ABookCheckWebViewHelper.java
    374 374 mOperationLogic.registTaskData(taskKey, operationId, hotSpotInfo, taskJson);
    375 375
    376
    376 377 TaskReportDto taskReportDto = mOperationLogic.getTaskReport(taskKey, taskReportLevel);
    378 int taskStatus = taskReportDto != null ? taskReportDto.taskStatus : 0;
    379
    380 if (localSavedFlg) {
    381 // 一時保存の場合、q_3_???の値でtaskStatusを取り出す
    382 Iterator<String> keys = taskJson.keys();
    383 while (keys.hasNext()) {
    384 String key = keys.next();
    385 if (key.startsWith("q_3_")) {
    386 taskStatus = taskJson.getInt(key);
    387 }
    388 }
    389 }
    • Kazuyuki Hida @hida-k commented Mar 20, 2023
      Developer

      一時保存の場合、「q_3_」から始まる設問の値とtaskStatusとするようにした。

      Edited Mar 20, 2023
      一時保存の場合、「q_3_」から始まる設問の値とtaskStatusとするようにした。
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    unmarked as a Work In Progress

    Mar 20, 2023

    unmarked as a Work In Progress

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

    assigned to @seo

    Mar 20, 2023

    assigned to @seo

    assigned to @seo
    Toggle commit list
  • Yujin Seo @seo

    resolved all discussions

    Mar 20, 2023

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Yujin Seo @seo

    merged

    Mar 20, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit 7efcd0ae

    Mar 20, 2023

    mentioned in commit 7efcd0ae

    mentioned in commit 7efcd0ae87156fb3254712cbbe64d19eee14b590
    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!308
×

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.