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

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

ロック周りを修正

Edited Feb 15, 2023 by Kazuyuki Hida
  • Discussion 4
  • Commits 2
  • 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/data/dao/TaskReportDao.java
    522 522 int count;
    523 523 StringBuilder sql = new StringBuilder();
    524 524 sql.append("SELECT count(*) FROM t_task_report");
    525 sql.append(" WHERE task_report_info_id > 0");
    525 sql.append(" WHERE task_status = 999 ");
    526 526 if (reportStartDate == null) {
    • 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
    Resolved by Yujin Seo Feb 16, 2023
    ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java
    94 95 static Result succsess(LockReportJSON reportJSON, Long taskReportId, Date reportStartDate) {
    95 96 // 成功したとき
    96 97 Result result = new Result();
    97 result.result = reportJSON.httpStatus == HTTP_OK ? 0 : 1;
    98 result.result = reportJSON.httpStatus == HTTP_OK || reportJSON.httpStatus == HTTP_NOT_FOUND ? 0 : 1;
    98 99 result.message = "";
    • Kazuyuki Hida @hida-k commented Feb 15, 2023
      Developer

      一時保存している報告はサーバーにないので、404を返すが、それをロック成功とみなすことになった。

      Edited Feb 16, 2023
      一時保存している報告はサーバーにないので、404を返すが、それをロック成功とみなすことになった。
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 15, 2023
    Resolved by Yujin Seo Feb 16, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java
    1113 1113 Date startDate = dateOrNull(abookCheckParam.get("reportStartDate"));
    1114 1114 TaskReportDao dao = AbstractDao.getDao(TaskReportDao.class);
    1115 if (dao.isLocalSaved(mTaskKey, taskReportId, DateTimeUtil.toString(startDate, DateTimeFormat.yyyyMMddHHmmss_hyphen))) {
    1116 // ローカルにしかない場合はロックしない
    1117 afterABookCheckApi(mCmd, mTaskKey, 0, "", "{'reportStatus':0}");
    1118 } else {
    1119 // ロック
    1120 LockReportLogic.Result r = LockReportLogic.newInstance().lock(taskKey, taskReportId, startDate);
    1121 // JSコールバック
    1122 afterABookCheckApi(mCmd, mTaskKey, r.getResult(), r.getMessage(), r.getExtParam().json());
    1123 }
    1115 // ロック
    1116 LockReportLogic.Result r = LockReportLogic.newInstance().lock(taskKey, taskReportId, startDate);
    1117 // JSコールバック
    1118 afterABookCheckApi(mCmd, mTaskKey, r.getResult(), r.getMessage(), r.getExtParam().json());
    1124 1119 } else if (mCmd.equals(ABookKeys.CMD_UNLOCK_REPORT)) {
    • Kazuyuki Hida @hida-k commented Feb 15, 2023
      Developer

      事前に一時保存かどうかを調べていたのを廃止

      Edited Feb 16, 2023
      事前に一時保存かどうかを調べていたのを廃止
    Please register or sign in to reply
  • Kazuyuki Hida
    @hida-k started a discussion on the diff Feb 15, 2023
    Resolved by Yujin Seo Feb 16, 2023
    ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/DashboardActivity.java
    184 184 settings.setPluginState(WebSettings.PluginState.ON); // 「EventHub.removeMessages(int what = 107) is not supported before the WebViewCore is set up.」のエラー対応(あまり効果ない?)
    185 185 settings.setDomStorageEnabled(true); // WebStorage有効化
    186 186 settings.setAppCacheEnabled(false);
    187 settings.setDisplayZoomControls(false);
    • Kazuyuki Hida @hida-k commented Feb 15, 2023
      Developer

      ズームボタンがでないようにした。

      Edited Feb 16, 2023
      ズームボタンがでないようにした。
    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
  • Yujin Seo @seo

    merged

    Feb 16, 2023

    merged

    merged
    Toggle commit list
  • Yujin Seo @seo

    mentioned in commit 9ad55880

    Feb 16, 2023

    mentioned in commit 9ad55880

    mentioned in commit 9ad55880c7af0e7a6a683d21aa8e0a50d8e140d0
    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!282
×

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.