Skip to content

Commit

Permalink
Merge pull request #2 from tokyo-metropolitan-gov/development
Browse files Browse the repository at this point in the history 
catchup forked upstream development
  • Loading branch information
@tmatsuno
tmatsuno authored Jan 26, 2021
2 parents 179c91e + ea752d8 commit c06def1
Show file tree
Hide file tree
Showing 16 changed files with 22,237 additions and 20,361 deletions.
2 changes: 1 addition & 1 deletion assets/locales/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@
"武蔵村山2": "Musashimurayama 2",
"このサイトの内容物は{creativeCommons}の下に提供されています（ただし商標等の他団体が権利を持つものは除く）。": "Content on this site is provided under {creativeCommons} (unless other organizations own trademarks or other rights).",
"Gマーク（グッドデザイン賞受賞マーク）": "G Mark (proof of winning the Good Design Award)",
"ただし商標等の他団体が権利を持つ以下のものは除きます。": "Except for following trademarks and other properties owned by other organizations:",
"ただし商標等の他団体が権利を持つ以下のものは除きます。": "However, following trademarks and other properties owned by other organizations are excluded:",
"コンテンツについて": "About content",
"各SNS（LINE、Twitter、Facebook、GitHub、YouTube）ロゴマーク": "Logos of social networking services (LINE, Twitter, Facebook, GitHub and YouTube)",
"このサイトの内容物はクリエイティブ・コモンズ 表示 4.0 ライセンスの下に提供されています。": "Content on this site is provided under a Creative Commons Attribution 4.0 International License.",
Expand Down
15 changes: 11 additions & 4 deletions data/agency.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/1\/18 17:25",
"date": "2021\/1\/25 14:00",
"periods": [
{
"begin": "2020-01-01",
Expand Down Expand Up @@ -224,6 +224,10 @@
{
"begin": "2021-01-11",
"end": "2021-01-17"
},
{
"begin": "2021-01-18",
"end": "2021-01-24"
}
],
"datasets": [
Expand Down Expand Up @@ -285,7 +289,8 @@
856,
0,
5306,
4614
4614,
5063
]
},
{
Expand Down Expand Up @@ -346,7 +351,8 @@
798,
0,
5931,
6071
6071,
6907
]
},
{
Expand Down Expand Up @@ -407,7 +413,8 @@
29,
0,
180,
194
194,
180
]
}
]
Expand Down
22 changes: 21 additions & 1 deletion data/consultation_about_fever.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/1\/22 20:00",
"date": "2021\/1\/26 20:00",
"data": [
{
"date": "2020-03-01",
Expand Down Expand Up @@ -1635,6 +1635,26 @@
"date": "2021-01-21",
"count": 59,
"weekly_average_count": 66.3
},
{
"date": "2021-01-22",
"count": 58,
"weekly_average_count": 63.3
},
{
"date": "2021-01-23",
"count": 76,
"weekly_average_count": 62.9
},
{
"date": "2021-01-24",
"count": 84,
"weekly_average_count": 63.1
},
{
"date": "2021-01-25",
"count": 57,
"weekly_average_count": 63.7
}
]
}
24 changes: 23 additions & 1 deletion data/daily_positive_detail.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"date": "2021\/1\/24 20:00",
"date": "2021\/1\/26 20:00",
"data": [
{
"diagnosed_date": "2020-01-20",
Expand Down Expand Up @@ -4081,6 +4081,28 @@
"weekly_average_count": 1202.9,
"weekly_average_untracked_count": 670.6,
"weekly_average_untracked_increse_percent": 74
},
{
"diagnosed_date": "2021-01-25",
"count": 618,
"missing_count": 310,
"reported_count": 308,
"weekly_gain_ratio": 0.75,
"untracked_percent": 55.2,
"weekly_average_count": 1119.1,
"weekly_average_untracked_count": 617.6,
"weekly_average_untracked_increse_percent": 69
},
{
"diagnosed_date": "2021-01-26",
"count": 1026,
"missing_count": 560,
"reported_count": 466,
"weekly_gain_ratio": 0.71,
"untracked_percent": 54.3,
"weekly_average_count": 1088.6,
"weekly_average_untracked_count": 590.6,
"weekly_average_untracked_increse_percent": 64.5
}
]
}
136 changes: 100 additions & 36 deletions data/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"contacts": {
"date": "2021\/01\/22 20:00",
"date": "2021\/01\/26 20:00",
"data": [
{
"日付": "2020-01-29T08:00:00.000Z",
Expand Down Expand Up @@ -3591,6 +3591,46 @@
"date": "2021-01-21",
"w": 4,
"小計": 545
},
{
"日付": "2021-01-22T08:00:00.000Z",
"曜日": "金",
"9-13時": 207,
"13-17時": 172,
"17-21時": 242,
"date": "2021-01-22",
"w": 5,
"小計": 621
},
{
"日付": "2021-01-23T08:00:00.000Z",
"曜日": "土",
"9-13時": 257,
"13-17時": 204,
"17-21時": 174,
"date": "2021-01-23",
"w": 6,
"小計": 635
},
{
"日付": "2021-01-24T08:00:00.000Z",
"曜日": "日",
"9-13時": 179,
"13-17時": 172,
"17-21時": 152,
"date": "2021-01-24",
"w": 0,
"小計": 503
},
{
"日付": "2021-01-25T08:00:00.000Z",
"曜日": "月",
"9-13時": 246,
"13-17時": 191,
"17-21時": 169,
"date": "2021-01-25",
"w": 1,
"小計": 606
}
]
},
Expand Down Expand Up @@ -6270,7 +6310,7 @@
]
},
"patients_summary": {
"date": "2021\/01\/24 20:00",
"date": "2021\/01\/26 20:00",
"data": [
{
"日付": "2020-01-24T08:00:00.000Z",
Expand Down Expand Up @@ -7739,11 +7779,19 @@
{
"日付": "2021-01-24T08:00:00.000Z",
"小計": 986
},
{
"日付": "2021-01-25T08:00:00.000Z",
"小計": 618
},
{
"日付": "2021-01-26T08:00:00.000Z",
"小計": 1026
}
]
},
"inspections_summary": {
"date": "2021\/01\/22 20:00",
"date": "2021\/01\/26 20:00",
"data": {
"都内": [
0,
Expand Down Expand Up @@ -8109,7 +8157,11 @@
210,
1071,
910,
744
744,
606,
801,
233,
381
],
"その他": [
0,
Expand Down Expand Up @@ -8475,6 +8527,10 @@
0,
0,
0,
0,
0,
0,
0,
0
],
"保険適用分": [
Expand Down Expand Up @@ -8821,27 +8877,31 @@
7763,
6149,
4536,
3572,
6065,
4645,
15346,
14889,
14007,
13683,
15182,
9174,
3217,
3576,
6066,
4654,
15360,
14895,
14027,
13705,
15206,
9199,
3220,
4044,
17632,
13962,
12833,
13178,
7096,
2650,
15343,
11782,
10192,
9018
17700,
14039,
12929,
13267,
7216,
2751,
15905,
12293,
10974,
10802,
11081,
5462,
1661,
11268
]
},
"labels": [
Expand Down Expand Up @@ -9208,50 +9268,54 @@
"2021-01-18",
"2021-01-19",
"2021-01-20",
"2021-01-21"
"2021-01-21",
"2021-01-22",
"2021-01-23",
"2021-01-24",
"2021-01-25"
]
},
"lastUpdate": "2021\/01\/24 20:00",
"lastUpdate": "2021\/01\/26 20:00",
"main_summary": {
"children": [
{
"attr": "陽性患者数",
"date": "2021\/1\/24 20:00",
"value": 93890,
"date": "2021\/1\/26 20:00",
"value": 95534,
"children": [
{
"attr": "入院中",
"value": 2798,
"value": 2847,
"children": [
{
"attr": "軽症・中等症",
"value": 2642
"value": 2699
},
{
"attr": "重症",
"value": 156
"value": 148
}
]
},
{
"attr": "退院",
"value": 74881
"value": 78028
},
{
"attr": "死亡",
"value": 782
"value": 809
},
{
"attr": "宿泊療養",
"value": 882
"value": 800
},
{
"attr": "自宅療養",
"value": 8474
"value": 7510
},
{
"attr": "調査中",
"value": 6073
"value": 5540
}
]
}
Expand Down
Loading

0 comments on commit c06def1

Please sign in to comment.