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

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

点検一覧の件数をリアルタイムで更新するようにした

定期点検の上部にある件数表示が、報告送信時に更新されるようにした。 そのほか、 JavaScriptとのインターフェースの修正 色の修正も含まれている。 テスト&デバッグフェーズなので、一貫性のない修正になってしまっている。

Edited Feb 13, 2023 by Kazuyuki Hida
  • Discussion 7
  • Commits 4
  • Changes 8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 13, 2023
    Resolved by Yujin Seo Feb 13, 2023
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
    994 1004 taskReportJson.put(String.format("taskReport_%s", String.valueOf(level)), taskReportJsonList);
    995 1005 }
    996 1006 }
    997
    1007 taskReportJson.put(OperationStartDate, DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen));
    1008 taskReportJson.put(OperationEndDate, DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMddHHmmss_hyphen));
    998 1009
    • Kazuyuki Hida @hida-k commented Feb 13, 2023
      Developer

      JavaScriptで必要になったパラメータを追加

      Edited Feb 13, 2023
      JavaScriptで必要になったパラメータを追加
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 13, 2023
    Resolved by Yujin Seo Feb 13, 2023
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
    1101 1130 taskReportInfoList.add(new JSONObject(dto.jsonData));
    1102 1131 }
    1103 1132 taskReportJsonRow.put(ABookKeys.TASK_REPORT_INFO, taskReportInfoList);
    1133 // ロックと差戻の情報を追加
    1134 addLockSendBackInfo(taskReportJsonRow, dto);
    1104 1135 taskReportJsonList.add(taskReportJsonRow);
    1105 1136 }
    1106 taskReportJsonRoot.put(ABookKeys.ENABLE_REPORT_UPDATE, mOperationDao.getOperation(operationId).enableReportUpdate);
    1137 OperationDto operationDto = mOperationDao.getOperation(operationId);
    1138 taskReportJsonRoot.put(ABookKeys.ENABLE_REPORT_UPDATE, operationDto.enableReportUpdate);
    1139
    1140 taskReportJsonRoot.put(OperationStartDate, DateTimeUtil.toString(operationDto.operationStartDate, DateTimeFormat.yyyyMMddHHmmss_hyphen));
    1141 taskReportJsonRoot.put(OperationEndDate, DateTimeUtil.toString(operationDto.operationEndDate, DateTimeFormat.yyyyMMddHHmmss_hyphen));
    1107 1142 // 最後のtaskReportId
    • Kazuyuki Hida @hida-k commented Feb 13, 2023
      Developer

      JavaScriptで必要になったパラメータを追加

      Edited Feb 13, 2023
      JavaScriptで必要になったパラメータを追加
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 13, 2023
    Resolved by Yujin Seo Feb 13, 2023
    ABVJE_UI_Android/res/layout-large/item_operation_list.xml
    102 102 android:textColor="@color/basic_white1"
    103 103 android:textSize="9pt"
    104 104 android:gravity="center"
    105 android:background="@color/marking_color_8"
    105 android:background="@color/task_count_completed"
    106 106 />
    107 107
    108 108 <LinearLayout
    • Kazuyuki Hida @hida-k commented Feb 13, 2023
      Developer

      仮に決めていた色をデザイン準拠にした

      Edited Feb 13, 2023
      仮に決めていた色をデザイン準拠にした
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 13, 2023
    Resolved by Yujin Seo Feb 13, 2023
    ABVJE_UI_Android/res/layout-large/item_operation_panel.xml
    88 88 android:textColor="@color/basic_white1"
    89 89 android:textSize="9pt"
    90 90 android:gravity="center"
    91 android:background="@color/marking_color_8"
    91 android:background="@color/task_count_completed"
    92 92 />
    • Kazuyuki Hida @hida-k commented Feb 13, 2023
      Developer

      仮に決めていた色をデザイン準拠にした

      Edited Feb 13, 2023
      仮に決めていた色をデザイン準拠にした
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 13, 2023
    Resolved by Yujin Seo Feb 13, 2023
    ABVJE_UI_Android/res/layout-normal/item_operation_list.xml
    112 112 android:textColor="@color/basic_white1"
    113 113 android:textSize="8pt"
    114 114 android:gravity="center"
    115 android:background="@color/marking_color_8"
    115 android:background="@color/task_count_completed"
    116 116 />
    • Kazuyuki Hida @hida-k commented Feb 13, 2023
      Developer

      仮に決めていた色をデザイン準拠にした

      Edited Feb 13, 2023
      仮に決めていた色をデザイン準拠にした
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 13, 2023
    Resolved by Yujin Seo Feb 13, 2023
    ABVJE_UI_Android/res/layout-normal/item_operation_panel.xml
    75 75 android:textColor="@color/basic_white1"
    76 76 android:textSize="9pt"
    77 77 android:gravity="center"
    78 android:background="@color/marking_color_8"
    78 android:background="@color/task_count_completed"
    • Kazuyuki Hida @hida-k commented Feb 13, 2023
      Developer

      仮に決めていた色をデザイン準拠にした

      Edited Feb 13, 2023
      仮に決めていた色をデザイン準拠にした
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 13, 2023
    Resolved by Yujin Seo Feb 13, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
    982 981 return null;
    983 982 }
    984 983 if (mCmd.equals(ABookKeys.CMD_INSERT_TASK_REPORT) || mCmd.equals(ABookKeys.CMD_UPDATE_TASK_REPORT)) {
    984 // データを同期する fixme かなり邪道なことをしているので、非同期処理全体を整理する必要がある
    985 ActivityHandlingHelper helper = ActivityHandlingHelper.getInstance();
    986 helper.getPreviousOperationListActivity().syncOperation(operationDto.operationId, operationDto.reportType, false);
    987 ABVEnvironment env = ABVEnvironment.getInstance();
    988 OperationLogic logic = AbstractLogic.getLogic(OperationLogic.class);
    989 try {
    990 logic.createJsonForOperationContent(operationDto.operationId, mContentPath, operationDto.reportType == Constant.ReportType.RoutineTask);
    991 } catch (IOException e) {
    992 e.printStackTrace();
    993 }
    994 // コールバック
    • Kazuyuki Hida @hida-k commented Feb 13, 2023
      Developer

      件数更新に必要な処理を追加した。 個々の処理は、既存の動作で処理されているが、非同期で行われるため、間違った順番で実行されていた。 本来は、それを整理することが最善ではあるが、時間が足りないので、ここで逐次動作するように処理を追加した。

      Edited Feb 13, 2023
      件数更新に必要な処理を追加した。 個々の処理は、既存の動作で処理されているが、非同期で行われるため、間違った順番で実行されていた。 本来は、それを整理することが最善ではあるが、時間が足りないので、ここで逐次動作するように処理を追加した。
    Please register or sign in to reply
  • Kazuyuki Hida @hida-k

    changed the description

    Feb 13, 2023

    changed the description

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

    assigned to @seo

    Feb 13, 2023

    assigned to @seo

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

    unmarked as a Work In Progress

    Feb 13, 2023

    unmarked as a Work In Progress

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

    resolved all discussions

    Feb 13, 2023

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Yujin Seo @seo

    merged

    Feb 13, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit dd279d72

    Feb 13, 2023

    mentioned in commit dd279d72

    mentioned in commit dd279d726ee17b9a42a61b54e280f830afa06b71
    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!277
×

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.