Skip to content

Commit

Permalink
【本番反映】病床円グラフの修正と感染者円グラフの追加 (#319)
Browse files Browse the repository at this point in the history
* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

* 最新のお知らせに記載していた対処方針(6.05方針)が古くなったため、表記ごと削除する。 (#283)

* Add Workflow daployment2

* Delete deployment2.yml

* Update SideNavigation.vue (#289)

「帰国者・接触者相談センター」が「新型コロナ・発熱患者受診相談窓口」に名称変更されたため、文言を変更。

* 【本番反映】「帰国者・接触者相談センター」を「新型コロナ・発熱患者受診相談窓口」に変更 (#291)

* Staging to Master #276 (#277)

* Dev naracity (#50)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Dev naracity (#81)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Update data.json/news.json (#45)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* Delete 退院には、死亡退院を含む

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

* Updata data.json on 3/27

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* update data.json, 陽性者グラフの初期表示を類型に (#52)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* update data.json and news.json by News Relsese on 3/28

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 【本番反映】感染者データ更新(3/28)と「 貢献の仕方」の修正 (#58)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* Add CircleChart 入院患者数と残り病床数

* Updade 4/1 and Add 入院患者数表 (#65)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* WIP add chart.d.ts

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

* Update data on 2nd Apr. (#70)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

* 入院患者数と病床数の円グラフの追加 (#71)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

* WIP add chart.d.ts

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #72 (#73)

4/3  update data.json +2

* Update news release on 4/3 

Issue #73

* 4/3のデータ更新と病床数円グラフの追加 (#74)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

* 入院患者数と病床数の円グラフの追加 (#71)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

* WIP add chart.d.ts

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #72 (#73)

4/3  update data.json +2

* Update news release on 4/3 

Issue #73

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 4/4の感染確認分の追加 (#76)

* Update data.json

* Update main_summary.json

* Update news.json

* Update sickbeds_summary.json

* Update sickbeds_summary.json

* 4/4の感染確認分の追加(更新日の更新漏れ) (#78)

* Update data.json

* Update main_summary.json

* Update news.json

* Update sickbeds_summary.json

* Update sickbeds_summary.json

* Update data.json

* Update sickbeds_summary.json

Co-authored-by: Yasushi IS <[email protected]>

* Fix PC検査グラフ, Update data_naracity.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 奈良市感染動向ページに奈良市提供のデータを追加。 (#101)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

* update data_naracity.json/奈良市のデータ

* Delete News-Section from 奈良市感染動向 and Update data_naracity.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* FIX サイドバーのリンク順。奈良市の感染動向を心配な時の上に

* Modify 更新 to 時点, Add note to 陽性者数 in 奈良市

* 陽性者の属性カードの右上の合計数に main_summary の陽性者数を表示

* Issue #192 fix link

* Issue #195 入院者数の状況の「入院者数」を「感染者数」に修正

* Use data.json only for Nara pref / 奈良県データをdata.json一つに統合

* update data.json

* update data.json made from GoogleSpreadSheet

* WIP fix 奈良市の検査陽性者の状況

* FIX naracity using anather svgCard for naracity

* Change Link in naracity.vue

* Modify design of 状況表

* WIP: mod workflow/develop.yml

* WIP: mod workflow/development.yml

* Delete 重症 from ConfirmedCasesTable

* Update workflow to use stopcovid19.code4nara.org/api/

* update data/data_naracity.json

* Fix delete naracity.json

* update workflow daily.yml

* FIX #217 「陽性者の属性」の居住地がすべて「不明」

* FIX #217 「陽性者の属性」の居住地がすべて「不明」

* update json

* Updete workflow, set rsync deploy

* Updete workflow, set rsync deploy test

* Updete workflow, set rsync deploy test add Set Key

* Updete workflow, set rsync deploy test delete tab

* Updete workflow, set rsync deploy test fix run rsync

* Updete workflow, set rsync deploy test fix run rsync

* Updete workflow, set rsync deploy test fix run rsync2

* Updete workflow, set rsync deploy test fix run rsync3

* Updete workflow, set rsync deploy test fix run rsync4

* Updete workflow, set rsync deploy test fix run rsync5

* Add COMMENTED rsync deploy function

* FIX word in PCR-Graph, 奈良市 to 奈良県

* Update deployment.yml

* WIP update 市町村関連ページ data/municipalities-data.json

* Update municipalitues, Totukawa and Kamikitayama

* Update municipalities-data.json, 平群町、川西町、宇陀市、桜井市、下市町、川上村

* Delete 奈良市内の最新感染動向 from SideBar

* add PCR検査陽性率グラフ

* data/data.json

* 陽性率の値の取り方を修正

* delete weeklizer.ts

* Delete package-lock.json

* update yarn.lock, add linq

* mod comment/陽性率グラフのコメント修正とデータの更新

* Update Workflow: Add staging branch, finx municipalities.json

* "PCR検査実施数"を"PCR等検査実施数"に変更 (#276)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* Readme.mdの更新&github/workflowの更新 (#279)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* deployment.ymlの追加 (#280)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* 最新のお知らせから奈良県対処方針(6.05)を削除 (#284)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

* 最新のお知らせに記載していた対処方針(6.05方針)が古くなったため、表記ごと削除する。 (#283)

* Add Workflow daployment2

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* 不要workflowファイル deployment2.yml の削除。 (#286)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

* 最新のお知らせに記載していた対処方針(6.05方針)が古くなったため、表記ごと削除する。 (#283)

* Add Workflow daployment2

* Delete deployment2.yml

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* 不要workflowファイル deployment2.yml の削除 (#287)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

* 最新のお知らせに記載していた対処方針(6.05方針)が古くなったため、表記ごと削除する。 (#283)

* Add Workflow daployment2

* Delete deployment2.yml

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* Delete deployment2.yml

* 【ステージング】「帰国者・接触者相談センター」を「新型コロナ・発熱患者受診相談窓口」に変更 (#290)

* Update Workflow: Add staging branch, finx municipalities.json

* Update index.vue

グラフタイトル「PCR検査実施数」を、2020年9月1日以降は、PCR検査以外に抗原検査の検査数も含まれるという意味で「PCR等検査実施数」と変更
#271

* Update JSON (#275)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update README.md

Add Staging URL and branches

* FIX type FIX type in README.md

* Recover .github/workflow/deployment.yml and build.yml

* Enable cron schddule Update daily.yml

cronにより毎日20時に実行

* Add deployment.yml for recover

* 最新のお知らせに記載していた対処方針(6.05方針)が古くなったため、表記ごと削除する。 (#283)

* Add Workflow daployment2

* Delete deployment2.yml

* Update SideNavigation.vue (#289)

「帰国者・接触者相談センター」が「新型コロナ・発熱患者受診相談窓口」に名称変更されたため、文言を変更。

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* 感染状況表の項目名と表幅の修正とdata.jsonの更新 (#294)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

* 入院者数の状況表の修正と2020/1/12項目変更対応

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Add 入院療養中数 and 調整中 to formatConfirmedCases.ts

* Add "extractCSS: true" for ERROR Webpack mode

PurgeCSSのビルド時のオプションを指定し、エラーを除去。

参考: https://coliss.com/articles/build-websites/operation/css/how-to-remove-unused-css.html

* Use data.json in github, Update develop.yml

* Update nuxt.config.ts

* Use api/data.json in stopcovid19.code4nara.org

* 感染病床円グラウの修正とdata.jsonの更新  (#298)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

* 入院者数の状況表の修正と2020/1/12項目変更対応

* Add 入院療養中数 and 調整中 to formatConfirmedCases.ts

* #293 Update circle-chart for data update on 2021/1/12

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 病床療養室数の円グラフのポップアップ時に文言の修正、単位を「床」に統一 (#299)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

* 入院者数の状況表の修正と2020/1/12項目変更対応

* Add 入院療養中数 and 調整中 to formatConfirmedCases.ts

* #293 Update circle-chart for data update on 2021/1/12

* Modifyed Popup in CiecleChart 病床室数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 円グラフ右上の 総病床+室数 を '総病床+療養室数 に

* data.jsonの更新 (#301)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

* 入院者数の状況表の修正と2020/1/12項目変更対応

* Add 入院療養中数 and 調整中 to formatConfirmedCases.ts

* #293 Update circle-chart for data update on 2021/1/12

* Modifyed Popup in CiecleChart 病床室数

* update data.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Cut Patients for test

* Fix json format, add column

* Update municipalities-data.json (#304)

* 残り病床数のマイナス対応。ソースないの data/data.json の更新 (#306)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

* 入院者数の状況表の修正と2020/1/12項目変更対応

* Add 入院療養中数 and 調整中 to formatConfirmedCases.ts

* #293 Update circle-chart for data update on 2021/1/12

* Modifyed Popup in CiecleChart 病床室数

* update data.json

* Update Comment and reduce css error v-sanitaize

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 「入院者数の状況」表を横型に変更し、文言を奈良県のページに合わせる (#310)

* update data.json, add inspection_persons_summary{}

* update workdflow, not to use naracity-data, remove unnecessarily yml

* Update data/data.json

* 入院者数の状況表の修正と2020/1/12項目変更対応

* Add 入院療養中数 and 調整中 to formatConfirmedCases.ts

* #293 Update circle-chart for data update on 2021/1/12

* Modifyed Popup in CiecleChart 病床室数

* update data.json

* Update Comment and reduce css error v-sanitaize

* #309 update 入院者数の状況, Use same words in Nara Pref Web.

* fix v-html to v-text by eslint error as XSS.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* FIx Error Message in Github Action log.

* Github Action test

* FIX type 入院・入所準備中数

* rebase type 入院入所準備中数

* update data.json

* update data.json

* update 総感染症病床・療養室数と入院・療養中数グラフ & 現在感染者の各状況の割合

* update chart

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Acid Chicken (硫酸鶏) <[email protected]>
  • Loading branch information
6 people authored May 5, 2021
1 parent 2cdd1db commit 2061b96
Show file tree
Hide file tree
Showing 7 changed files with 19,184 additions and 54 deletions.
47 changes: 10 additions & 37 deletions components/CircleChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,11 @@
:source-url="sourceUrl"
>
<template v-slot:button>
<!--
<ul :class="$style.GraphDesc">
<i18n tag="li" path="(注)病床数は{data}の入院可能病床数">
<a
:class="$style.GraphLink"
href="http://www.pref.nara.jp/55181.htm"
target="_blank"
rel="noopener"
place="data"
>
奈良県オープンデータ
</a>
</i18n>
</ul>
!-->
<p :class="$style.GraphDesc">
{{ $t('感染症病床と療養室数の合計に対する利用数のグラフです。') }}
<br />
{{ $t('残り病床計には重症者用を含む全ての空き病床の合計です。') }}
</p>
</template>
<pie-chart
:style="{ display: canvas ? 'block' : 'none' }"
Expand All @@ -44,11 +34,7 @@
item-key="name"
/>
<template v-slot:infoPanel>
<data-view-basic-info-panel
:l-text="displayInfo.lText"
:s-text="displayInfo.sText"
:unit="displayInfo.unit"
/>
<data-view-basic-info-panel :l-text="displayInfo.lText" :s-text="displayInfo.sText" :unit="displayInfo.unit" />
</template>
<template v-slot:footer>
<open-data-link v-show="url" :url="url" />
Expand Down Expand Up @@ -125,13 +111,7 @@ type Props = {
sourceUrl: string
}
const options: ThisTypedComponentOptionsWithRecordProps<
Vue,
Data,
Methods,
Computed,
Props
> = {
const options: ThisTypedComponentOptionsWithRecordProps<Vue, Data, Methods, Computed, Props> = {
created() {
this.canvas = process.browser
},
Expand Down Expand Up @@ -190,9 +170,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
computed: {
displayInfo() {
return {
lText: this.chartData[
this.chartData.length - 1
].cumulative.toLocaleString(),
lText: this.chartData[this.chartData.length - 1].cumulative.toLocaleString(),
sText: this.info,
unit: this.unit
}
Expand Down Expand Up @@ -233,9 +211,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
) */
return `${chartData[tooltipItem.index].transition} ${
tooltipItem.index === 1 ? unit : ''
} (総数: ${chartData[0].transition +
chartData[1].transition +
chartData[2].transition}${unit})`
} (総数: ${chartData[0].transition + chartData[1].transition + chartData[2].transition}${unit})`
},
title(tooltipItem: any, data: any) {
return data.labels[tooltipItem[0].index]
Expand Down Expand Up @@ -269,10 +245,7 @@ const options: ThisTypedComponentOptionsWithRecordProps<
},
tableData() {
return this.chartData.map((_, i) => {
return Object.assign(
{ text: this.chartData[i].label },
{ [i]: this.chartData[i].transition }
)
return Object.assign({ text: this.chartData[i].label }, { [i]: this.chartData[i].transition })
})
}
}
Expand Down
270 changes: 270 additions & 0 deletions components/CircleChartMan.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
<template>
<data-view
:title="title"
:title-id="titleId"
:date="date"
:url="url"
:source-text="sourceText"
:source-url="sourceUrl"
>
<template v-slot:button>
<p :class="$style.GraphDesc">
{{ $t('入院・療養中の人数は重症者の人数を除いた数字です。') }}
</p>
</template>
<pie-chart
:style="{ display: canvas ? 'block' : 'none' }"
:chart-id="chartId"
:chart-data="displayData"
:options="displayOption"
:height="240"
/>
<v-data-table
:style="{ top: '-9999px', position: canvas ? 'fixed' : 'static' }"
:headers="tableHeaders"
:items="tableData"
:items-per-page="-1"
:hide-default-footer="true"
:height="240"
:fixed-header="true"
:mobile-breakpoint="0"
class="cardTable"
item-key="name"
/>
<template v-slot:infoPanel>
<data-view-basic-info-panel :l-text="displayInfo.lText" :s-text="displayInfo.sText" :unit="displayInfo.unit" />
</template>
<template v-slot:footer>
<open-data-link v-show="url" :url="url" />
</template>
</data-view>
</template>

<script lang="ts">
import Vue from 'vue'
import { ThisTypedComponentOptionsWithRecordProps } from 'vue/types/options'
import { GraphDataType } from '@/utils/formatVariableGraph'
import DataView from '@/components/DataView.vue'
import DataViewBasicInfoPanel from '@/components/DataViewBasicInfoPanel.vue'
import { doubleGray as colors } from '@/utils/colors'
import OpenDataLink from '@/components/OpenDataLink.vue'
interface HTMLElementEvent<T extends HTMLElement> extends Event {
currentTarget: T
}
type Data = {
dataKind: 'transition' | 'cumulative'
canvas: boolean
}
type Methods = {}
type Computed = {
displayInfo: {
lText: string
sText: string
unit: string
}
displayData: {
labels: string[]
datasets: {
label: string[]
data: number[]
backgroundColor: string[]
}[]
}
displayOption: {
tooltips: {
displayColors: boolean
callbacks: {
label: (tooltipItem: any) => string
title: (tooltipItem: any, data: any) => string
}
}
responsive: boolean
maintainAspectRatio: boolean
legend: {
display: boolean
onHover: (e: HTMLElementEvent<HTMLElement>) => void
onLeave: (e: HTMLElementEvent<HTMLElement>) => void
}
}
tableHeaders: {
text: string
value: string
}[]
tableData: {
[key: number]: number
}[]
}
type Props = {
title: string
titleId: string
chartId: string
chartData: GraphDataType[]
date: string
unit: string
info: string
url: string
sourceText: string
sourceUrl: string
}
const options: ThisTypedComponentOptionsWithRecordProps<Vue, Data, Methods, Computed, Props> = {
created() {
this.canvas = process.browser
},
components: { DataView, DataViewBasicInfoPanel, OpenDataLink },
props: {
title: {
type: String,
default: ''
},
titleId: {
type: String,
default: ''
},
chartId: {
type: String,
default: 'pie-chart'
},
chartData: {
type: Array,
required: false,
default: () => []
},
date: {
type: String,
required: true,
default: ''
},
unit: {
type: String,
default: ''
},
info: {
type: String,
default: ''
},
url: {
type: String,
required: false,
default: ''
},
sourceText: {
type: String,
required: false,
default: ''
},
sourceUrl: {
type: String,
required: false,
default: ''
}
},
data: () => ({
dataKind: 'transition',
canvas: true
}),
computed: {
displayInfo() {
return {
lText: this.chartData[this.chartData.length - 1].cumulative.toLocaleString(),
sText: this.info,
unit: this.unit
}
},
displayData() {
return {
labels: this.chartData.map(d => {
return d.label
}),
datasets: [
{
label: this.chartData.map(d => {
return d.label
}),
data: this.chartData.map(d => {
return d.transition
}),
backgroundColor: this.chartData.map((_d, index) => {
return colors[index]
}),
borderWidth: 0
}
]
}
},
displayOption() {
const unit = this.unit
const chartData = this.chartData
const options = {
tooltips: {
displayColors: false,
callbacks: {
label(tooltipItem: any) {
/* return (
parseInt(
chartData[tooltipItem.index].transition
).toLocaleString() + unit
) */
return `${chartData[tooltipItem.index].transition} ${
tooltipItem.index === 1 ? unit : ''
} (合計: ${chartData[0].transition + chartData[1].transition + chartData[2].transition}${unit})`
},
title(tooltipItem: any, data: any) {
return data.labels[tooltipItem[0].index]
}
}
},
responsive: true,
maintainAspectRatio: false,
legend: {
display: true,
onHover: (e: HTMLElementEvent<HTMLElement>): void => {
e.currentTarget.style.cursor = 'pointer'
},
onLeave: (e: HTMLElementEvent<HTMLElement>): void => {
e.currentTarget.style.cursor = 'default'
}
}
}
if (this.$route.query.ogp === 'true') {
Object.assign(options, { animation: { duration: 0 } })
}
return options
},
tableHeaders() {
return [
{ text: '', value: 'text' },
...this.chartData.map((d, index) => {
return { text: d.label, value: String(index) }
})
]
},
tableData() {
return this.chartData.map((_, i) => {
return Object.assign({ text: this.chartData[i].label }, { [i]: this.chartData[i].transition })
})
}
}
}
export default Vue.extend(options)
</script>

<style module lang="scss">
.Graph {
&Desc {
width: 100%;
margin: 0;
margin-bottom: 0 !important;
padding-left: 0 !important;
font-size: 12px;
color: $gray-3;
list-style: none;
}
&Link {
text-decoration: none;
}
}
</style>
6 changes: 3 additions & 3 deletions components/cards/PatientsAndSickbeds.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-col cols="12" md="6" class="DataCard">
<circle-chart
:title="$t('感染症病床+療養室数と入院・療養者数')"
:title="$t('総感染症病床・療養室数と入院・療養中数')"
:title-id="'patients-and-sickbeds'"
:chart-data="sickbedsGraph"
:date="Data.patientstat_summary.date"
Expand Down Expand Up @@ -37,8 +37,8 @@ export default {
},
data() {
// 入院患者数
// const sickbedsGraph = formatVariableGraph(Data.sickbeds_summary.data)
const sickbedsGraph = formatVariableGraph(Data.patientstat_summary.data)
const sickbedsGraph = formatVariableGraph(Data.sickbeds_summary.data)
// const sickbedsGraph = formatVariableGraph(Data.patientstat_summary.data)
const data = {
Data,
Expand Down
Loading

0 comments on commit 2061b96

Please sign in to comment.