Commits · 5887a91fc6c088dafe31e79d36ecbca09f4d7d88 · abook_android / abook_check · GitLab

06 Feb, 2023 2 commits
- Merge branch 'feature/contract/sato/1.0.300_operation_counts' into 'contract/sato/1.0.300' · 5887a91f
```
件数表示周りの不具合の修正

See merge request !271
```
  Yujin Seo committed Feb 06, 2023
  5887a91f Browse Files
- ダッシュボードの件数表示と一覧表示の不具合を修正 · f87bac92
  Kazuyuki Hida committed Feb 06, 2023
  
  f87bac92 Browse Files
02 Feb, 2023 5 commits
- フラグの切り換えを忘れていた。 · f6eef977
  Kazuyuki Hida committed Feb 02, 2023
  
  f6eef977 Browse Files
- 設定やメソッド名の修正 · f2844854
  Kazuyuki Hida committed Feb 02, 2023
  
  f2844854 Browse Files
- ダッシュボードで、getReportStatusCountを実装し、アプリ側から強制的に実行するようにした。 · 4d3505cc
```
JS側が受けてくれないので、実際に表示には反映されない。
```
  Kazuyuki Hida committed Feb 02, 2023
  4d3505cc Browse Files
- 作業一覧にローカル保存しているデータ数が反映されるようにした。 · 728ae416
  Kazuyuki Hida committed Feb 02, 2023
  
  728ae416 Browse Files
- 報告書の送信時に件数調整を行うようにした · 8d4e25d8
  Kazuyuki Hida committed Feb 02, 2023
  
  8d4e25d8 Browse Files
01 Feb, 2023 4 commits
- Merge branch 'contract/sato/1.0.300_hida' into 'contract/sato/1.0.300' · fe5d22b4
```
ロック取得後に報告書が開かない不具合を修正

See merge request !270
```
  Kazuyuki Hida committed Feb 01, 2023
  fe5d22b4 Browse Files
- 開発用環境 · 044e5047
  Kazuyuki Hida committed Feb 01, 2023
  
  044e5047 Browse Files
- Merge branch 'feature/contract/sato/1.0.300_fix_lock' into contract/sato/1.0.300_hida · e518450d
  Kazuyuki Hida committed Feb 01, 2023
  
  e518450d Browse Files
- 定期点検の報告書が開かなかった原因は、Dateの書式の問題だった。 · b5dc7caf
  Kazuyuki Hida committed Feb 01, 2023
  
  b5dc7caf Browse Files
31 Jan, 2023 7 commits
- Merge branch 'contract/sato/1.0.300_dev' into 'contract/sato/1.0.300' · c3a7adee
```
Contract/sato/1.0.300 dev

See merge request !269
```
  Kazuyuki Hida committed Jan 31, 2023
  c3a7adee Browse Files
- Merge branch 'feature/contract/sato/1.0.300_fix_lock' into 'contract/sato/1.0.300_dev' · fb8921fa
```
ロック、アンロックの不具合修正

See merge request !268
```
  Kazuyuki Hida committed Jan 31, 2023
  fb8921fa Browse Files
- 一部のソースを整理 · ebc59094
  Kazuyuki Hida committed Jan 31, 2023
  
  ebc59094 Browse Files
- ロック、アンロックに起因する不具合を修正。 · 0b758ac4
  Kazuyuki Hida committed Jan 31, 2023
  
  0b758ac4 Browse Files
- Merge branch 'feature/contract/sato/1.0.300_fix_lock' into 'contract/sato/1.0.300' · 2a25c15c
```
APIで使用するDateの書式が間違っていたのを修正。

See merge request !267
```
  Kazuyuki Hida committed Jan 31, 2023
  2a25c15c Browse Files
- Merge branch 'feature/contract/sato/1.0.300_fix_lock' into 'contract/sato/1.0.300_dev' · bfd2d2c1
```
APIで使用するDateの書式が間違っていたのを修正。

See merge request !266
```
  Kazuyuki Hida committed Jan 31, 2023
  bfd2d2c1 Browse Files
- APIで使用するDateの書式が間違っていたのを修正。 · f90a556d
  Kazuyuki Hida committed Jan 31, 2023
  
  f90a556d Browse Files
30 Jan, 2023 9 commits
- Merge branch 'feature/contract/sato/1.0.300_fix_lock' into 'contract/sato/1.0.300_dev' · 1947ab3b
```
ロック周りの不具合修正

See merge request !265
```
  Kazuyuki Hida committed Jan 30, 2023
  1947ab3b Browse Files
- ロック周りの不具合修正 · 12edc56c
  Kazuyuki Hida committed Jan 30, 2023
  
  12edc56c Browse Files
- Merge branch 'contract/sato/1.0.300_hida' into 'contract/sato/1.0.300_dev' · 658b9ed9
```
ダッシュボードの実装

See merge request !264
```
  Kazuyuki Hida committed Jan 30, 2023
  658b9ed9 Browse Files
- サブモジュールの更新 · 67bed2d6
  Kazuyuki Hida committed Jan 30, 2023
  
  67bed2d6 Browse Files
- サブモジュールの更新 · eb63cad7
  Kazuyuki Hida committed Jan 30, 2023
  
  eb63cad7 Browse Files
- 文字列リテラルが残っていたので修正した。 · 75cef969
  Kazuyuki Hida committed Jan 30, 2023
  
  75cef969 Browse Files
- インスペクションの設定を標準に戻した · c366960a
  Kazuyuki Hida committed Jan 30, 2023
  
  c366960a Browse Files
- 文字列リテラルの排除と、ユーティリティ関数の集約 · 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
```
  Kazuyuki Hida 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 3 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