Commits · e85e78d569a653f4aaab0c720c3deea108485d73 · abook_android / abook_check

30 Jan, 2023 2 commits

文字列リテラルの排除と、ユーティリティ関数の集約 · e85e78d5
Kazuyuki Hida committed Jan 30, 2023

e85e78d5 Browse Files

Merge branch 'contract/sato/1.0.300_dev' into contract/sato/1.0.300_hida · d23461b3

# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/client/json/LockReportJSON.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/LockReportLogic.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/UnlockReportLogic.java
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

committed Jan 30, 2023

d23461b3 Browse Files

27 Jan, 2023 10 commits
- Merge branch 'feature/contract/sato/1.0.300_51565_js_interface' into 'contract/sato/1.0.300_dev' · f381ab70
```
報告書の排他制御

See merge request !262
```
  Kazuyuki Hida committed Jan 27, 2023
  f381ab70 Browse Files
- コメントの消し忘れ · 01da32ae
  Kazuyuki Hida committed Jan 27, 2023
  
  01da32ae Browse Files
- 文字列リテラルを文字列定数に置き換えた · 3b6a2e99
  Kazuyuki Hida committed Jan 27, 2023
  
  3b6a2e99 Browse Files
- JSONから値を取り出すユーティリティを集約した · 9638c11e
  Kazuyuki Hida committed Jan 27, 2023
  
  9638c11e Browse Files
- Merge branch 'contract/sato/1.0.300_dev' into feature/contract/sato/1.0.300_51565_js_interface · ff4f0eee
```
# Conflicts:
#	gradle.properties
```
  Kazuyuki Hida committed Jan 27, 2023
  ff4f0eee Browse Files
- Merge branch 'contract/sato/1.0.300_dev' into contract/sato/1.0.300_hida · 61be2a86
  Kazuyuki Hida committed Jan 27, 2023
  
  61be2a86 Browse Files
- Merge branch 'feature/contract/sato/1.0.300_51433_show_help' into 'contract/sato/1.0.300_dev' · 660516f0
```
ヘルプ表示の変更

See merge request !261
```
  Yujin Seo committed Jan 27, 2023
  660516f0 Browse Files
- Merge branch 'contract/sato/1.0.300_dev' into contract/sato/1.0.300_hida · 424af1d9
```
# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
```
  Kazuyuki Hida committed Jan 27, 2023
  424af1d9 Browse Files
- Merge branch 'contract/sato/1.0.300_dev' into feature/contract/sato/1.0.300_51433_show_help · 8ee9b599
  Kazuyuki Hida committed Jan 27, 2023
  
  8ee9b599 Browse Files
- Merge branch 'feature/contract/sato/1.0.300_51420' into 'contract/sato/1.0.300_dev' · b2b48d1c
```
ダッシュボードの追加

See merge request !260
```
  Yujin Seo committed Jan 27, 2023
  b2b48d1c Browse Files
26 Jan, 2023 7 commits
- Merge branch 'contract/sato/1.0.300_dev' into contract/sato/1.0.300_hida · fd08de85
```
# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
#	gradle.properties
```
  Kazuyuki Hida committed Jan 26, 2023
  fd08de85 Browse Files
- 型の不整合を修正 · fe19586a
  Kazuyuki Hida committed Jan 26, 2023
  
  fe19586a Browse Files
- Merge branch 'contract/sato/1.0.300_dev' into feature/contract/sato/1.0.300_51420 · 36df8367
  Kazuyuki Hida committed Jan 26, 2023
  
  36df8367 Browse Files
- Merge branch 'feature/contract/sato/1.0.300_51417' into 'contract/sato/1.0.300_dev' · ec27fafb
```
#51417 ステータス表示追加

See merge request !259
```
  Yujin Seo committed Jan 26, 2023
  ec27fafb Browse Files
- ストア用のビルドの修正もれ · 0228b69f
  Kazuyuki Hida committed Jan 26, 2023
  
  0228b69f Browse Files
- Merge branch 'contract/sato/1.0.300_dev' into feature/contract/sato/1.0.300_51417 · fcc3be72
```
# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/dto/TaskReportDto.java
```
  Kazuyuki Hida committed Jan 26, 2023
  fcc3be72 Browse Files
- Merge branch 'contract/sato/1.0.300_51462' into 'contract/sato/1.0.300_dev' · 76978cd6
```
Contract/sato/1.0.300 51462

See merge request !258
```
  Kazuyuki Hida committed Jan 26, 2023
  76978cd6 Browse Files
25 Jan, 2023 2 commits
- レビューでの指摘事項を修正。 · 93022493
  Kazuyuki Hida committed Jan 25, 2023
  
  93022493 Browse Files
- checkapi/taskData/ のレスポンスをJSのコールバックにextParamとして渡すようにした（暫定的な実装）。 · 7e1e33dd
  Kazuyuki Hida committed Jan 25, 2023
  
  7e1e33dd Browse Files
24 Jan, 2023 4 commits
- ダッシュボード用のAPI（getReportStatusCount）を実装した。動作確認ができていない。 · e38d4b24
  Kazuyuki Hida committed Jan 24, 2023
  
  e38d4b24 Browse Files
- ダッシュボードから報告一覧・定期点検の画面への遷移を実装した。 · 5e96dcf4
  Kazuyuki Hida committed Jan 24, 2023
  
  5e96dcf4 Browse Files
- パース漏れの修正 · 1fcc3515
  Kazuyuki Hida committed Jan 24, 2023
  
  1fcc3515 Browse Files
- ロック周りの不具合修正 · 01d1e81a
  Kazuyuki Hida committed Jan 24, 2023
  
  01d1e81a Browse Files
23 Jan, 2023 1 commit
- ダッシュボードの一時保存を実装 · 368658bf
  Kazuyuki Hida committed Jan 23, 2023
  
  368658bf Browse Files
20 Jan, 2023 1 commit
- ロック関係の実装を変更した · d07cec67
  Kazuyuki Hida committed Jan 20, 2023
  
  d07cec67 Browse Files
19 Jan, 2023 1 commit
- ロック関係の実装を変更する前にいったんコミット · 737a1a48
  Kazuyuki Hida committed Jan 19, 2023
  
  737a1a48 Browse Files
18 Jan, 2023 1 commit
- JSに渡すJSONを作るところまでできた。 · 1bb6e002
  Kazuyuki Hida committed Jan 18, 2023
  
  1bb6e002 Browse Files
17 Jan, 2023 3 commits
- JSとのデータの受け渡しはしていないが、ダミーの値でダッシュボードが表示されるところまでできた。 · df49fae1
  Kazuyuki Hida committed Jan 17, 2023
  
  df49fae1 Browse Files
- dashboardのActivityを開くところまではできた。JavaScriptとのインターフェースは手つかず · 76af564a
  Kazuyuki Hida committed Jan 17, 2023
  
  76af564a Browse Files
- dashboardのサブモジュールを取り込んだ · e272fadf
  Kazuyuki Hida committed Jan 17, 2023
  
  e272fadf Browse Files
16 Jan, 2023 1 commit
- extParamに、taskReportIdとreportStartDateを追加 · c524f49f
  Kazuyuki Hida committed Jan 16, 2023
  
  c524f49f Browse Files
13 Jan, 2023 1 commit
- ロックの結果をローカルのDBに反映するようにした。 · a4f62104
  Kazuyuki Hida committed Jan 13, 2023
  
  a4f62104 Browse Files
12 Jan, 2023 1 commit
- ロックのコールバック呼び出しを実装した。 · 0474d906
  Kazuyuki Hida committed Jan 12, 2023
  
  0474d906 Browse Files
06 Jan, 2023 1 commit
- 割り込みの仕事が入ったので、いったんコミット · b46fc80c
  Kazuyuki Hida committed Jan 06, 2023
  
  b46fc80c Browse Files
04 Jan, 2023 3 commits
- 韓国語は英語で代用 · bca9e56d
  Kazuyuki Hida committed Jan 04, 2023
  
  bca9e56d Browse Files
- ダッシュボードのヘルプ表示を追加 · 269dda45
  Kazuyuki Hida committed Jan 04, 2023
  
  269dda45 Browse Files
- ヘルプダイアログに説明文を追加 · 9a7af04a
  Kazuyuki Hida committed Jan 04, 2023
  
  9a7af04a Browse Files
28 Dec, 2022 1 commit
- WebViewの埋め込み · 3fdc59b2
  Kazuyuki Hida committed Dec 28, 2022
  
  3fdc59b2 Browse Files