From cbb4253113f46de7d966f37584daf4bd42981e67 Mon Sep 17 00:00:00 2001 From: Kosuke Ogawa Date: Thu, 23 Apr 2020 21:42:25 +0900 Subject: [PATCH 01/10] =?UTF-8?q?20200423=20=E9=99=BD=E6=80=A7=E6=82=A3?= =?UTF-8?q?=E8=80=85=E3=81=AE=E5=B1=9E=E6=80=A7=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 退院 https://www.umk.co.jp/news/?date=20200423&id=03369 --- data/data.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/data.json b/data/data.json index a66a016da112b..92ec3f9ef018b 100755 --- a/data/data.json +++ b/data/data.json @@ -1,7 +1,7 @@ { - "lastUpdate": "2020/04/22", + "lastUpdate": "2020/04/23", "patients": { - "date": "2020/04/22", + "date": "2020/04/23", "data": [ { "リリース日": "2020-03-04T08:00:00.000Z", @@ -80,8 +80,8 @@ "居住地": "宮崎市", "年代": "60代", "性別": "男性", - "退院": "入院中", - "date": "2020-04-05" + "退院": "退院", + "date": "2020-04-23" }, { "リリース日": "2020-04-06T08:00:00.000Z", @@ -151,11 +151,11 @@ "children": [ { "attr": "入院中", - "value": 11, + "value": 10, "children": [ { "attr": "軽症・中等症", - "value": 11 + "value": 10 }, { "attr": "重症", @@ -165,7 +165,7 @@ }, { "attr": "退院", - "value": 6 + "value": 7 }, { "attr": "死亡", From 6552efa9c21ce82a54d612d185cf1b8ece2479ae Mon Sep 17 00:00:00 2001 From: Futa HIRAKOBA Date: Sat, 25 Apr 2020 01:14:03 +0900 Subject: [PATCH 02/10] Update pr_test.yml --- .github/workflows/pr_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml index 4609f75af98e7..fc71b8739899f 100644 --- a/.github/workflows/pr_test.yml +++ b/.github/workflows/pr_test.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - development + - master jobs: build: runs-on: ubuntu-18.04 From bd778dd900971e1551b649c0066dec6e7be6e017 Mon Sep 17 00:00:00 2001 From: Tatsumi0000 Date: Sat, 25 Apr 2020 11:21:24 +0900 Subject: [PATCH 03/10] =?UTF-8?q?Add:=20=E8=87=AA=E5=8B=95=E3=81=A7?= =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=83=A9=E3=83=99=E3=83=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/scraping.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/scraping.yml b/.github/workflows/scraping.yml index bbbe0abadd550..252aec6044496 100644 --- a/.github/workflows/scraping.yml +++ b/.github/workflows/scraping.yml @@ -53,4 +53,5 @@ jobs: title: コロナ情報の更新 commit-message: コロナ情報を更新しました． branch: auto_update_covid19 + labels: auto_merge base: master From 5ea094d770c4903b68f5007d5ba14a4f82a95373 Mon Sep 17 00:00:00 2001 From: koogawa Date: Sat, 25 Apr 2020 16:30:05 +0900 Subject: [PATCH 04/10] =?UTF-8?q?Fix=20#183=20=E9=99=BD=E6=80=A7=E6=82=A3?= =?UTF-8?q?=E8=80=85=E6=95=B0=E3=82=B0=E3=83=A9=E3=83=95=E3=81=AB=E3=81=8A?= =?UTF-8?q?=E3=81=91=E3=82=8B=E6=9C=80=E6=96=B0=E6=97=A5=E3=81=AE=E6=A3=92?= =?UTF-8?q?=E3=82=B0=E3=83=A9=E3=83=95=E3=81=8C=E5=8D=8A=E5=88=86=E9=80=94?= =?UTF-8?q?=E6=AC=A0=E3=81=91=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/TimeBarChart.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index a4c3b3c122a0b..9971b343d43f4 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -250,6 +250,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: false }, + offset: true, ticks: { fontSize: 9, maxTicksLimit: 20, From 8c8b126e49fcfe7de74ca4648f5392e97f412a23 Mon Sep 17 00:00:00 2001 From: koogawa Date: Sat, 25 Apr 2020 17:32:20 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=E9=99=BD=E6=80=A7=E6=82=A3=E8=80=85?= =?UTF-8?q?=E6=95=B0=E3=82=B0=E3=83=A9=E3=83=95=E3=81=AB=E3=81=8A=E3=81=91?= =?UTF-8?q?=E3=82=8B=E5=89=8D=E6=97=A5=E6=AF=94=E3=81=8C=E7=95=B0=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20Fix=20#182?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/TimeBarChart.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index 9971b343d43f4..2a415582a6e0c 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -163,6 +163,15 @@ const options: ThisTypedComponentOptionsWithRecordProps< displayTransitionRatio() { const lastDay = this.chartData.slice(-1)[0].transition const lastDayBefore = this.chartData.slice(-2)[0].transition + const lastDayLabel = this.chartData.slice(-1)[0].label + const lastDayBeforeLabel = this.chartData.slice(-2)[0].label + const lastDayDate = new Date(lastDayLabel).getTime() + const lastDayBeforeDate = new Date(lastDayBeforeLabel).getTime() + + // 1日以上差があるということは昨日はゼロ件なのでゼロと比較する必要あり（86,400,000ミリ秒＝１日） + const dateDiff = (lastDayDate - lastDayBeforeDate) / 86400000 + if (dateDiff > 1) return this.formatDayBeforeRatio(lastDay - 0) + return this.formatDayBeforeRatio(lastDay - lastDayBefore) }, displayInfo() { From bf2b0e2f19163feb121316919cf4b4230075ad9a Mon Sep 17 00:00:00 2001 From: koogawa Date: Sat, 25 Apr 2020 21:37:15 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/TimeBarChart.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index 2a415582a6e0c..aad5c11d63449 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -165,11 +165,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< const lastDayBefore = this.chartData.slice(-2)[0].transition const lastDayLabel = this.chartData.slice(-1)[0].label const lastDayBeforeLabel = this.chartData.slice(-2)[0].label - const lastDayDate = new Date(lastDayLabel).getTime() - const lastDayBeforeDate = new Date(lastDayBeforeLabel).getTime() + const lastDayTime = new Date(lastDayLabel).getTime() + const lastDayBeforeTime = new Date(lastDayBeforeLabel).getTime() // 1日以上差があるということは昨日はゼロ件なのでゼロと比較する必要あり（86,400,000ミリ秒＝１日） - const dateDiff = (lastDayDate - lastDayBeforeDate) / 86400000 + const dateDiff = (lastDayTime - lastDayBeforeTime) / 86400000 if (dateDiff > 1) return this.formatDayBeforeRatio(lastDay - 0) return this.formatDayBeforeRatio(lastDay - lastDayBefore) From bb03215905eaa0b8b53682f3fe05a62a9b16d6d8 Mon Sep 17 00:00:00 2001 From: Tatsumi0000 Date: Sun, 26 Apr 2020 01:47:43 +0900 Subject: [PATCH 07/10] =?UTF-8?q?Fix:=20=E3=82=B3=E3=83=94=E3=83=BC?= =?UTF-8?q?=E6=99=82=E3=81=AB=E6=9B=B4=E6=96=B0=E6=97=A5=E6=99=82=E3=81=8C?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/DataView.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/DataView.vue b/components/DataView.vue index 8352419967eb5..ab0586bab61d3 100644 --- a/components/DataView.vue +++ b/components/DataView.vue @@ -138,10 +138,6 @@
{{ $t('埋め込みコードをコピーしました') }}
- - - - From 7d783eb0dea34d99bb8975da97a5b2e712fb9973 Mon Sep 17 00:00:00 2001 From: Tatsumi0000 Date: Sun, 26 Apr 2020 02:25:21 +0900 Subject: [PATCH 08/10] =?UTF-8?q?Fix:=20=E3=83=95=E3=83=83=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E5=89=8A=E9=99=A4=E3=81=AB=E4=BC=B4=E3=81=86?= =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=AE=E3=82=BA=E3=83=AC?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/DataView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/DataView.vue b/components/DataView.vue index ab0586bab61d3..84eebac9d4b83 100644 --- a/components/DataView.vue +++ b/components/DataView.vue @@ -472,7 +472,7 @@ export default Vue.extend({ .icon-resize { border-radius: 50%; - font-size: 30px; + // font-size: 30px; &.twitter { color: #fff; From 76bdb1ed26b50d4d6ea9cee7bf21458a608c9f4b Mon Sep 17 00:00:00 2001 From: Kosuke Ogawa Date: Sun, 26 Apr 2020 21:11:01 +0900 Subject: [PATCH 09/10] =?UTF-8?q?20200426=20=E9=99=BD=E6=80=A7=E6=82=A3?= =?UTF-8?q?=E8=80=85=E3=81=AE=E5=B1=9E=E6=80=A7=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.umk.co.jp/news/?date=20200426&id=03395 --- data/data.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/data.json b/data/data.json index 92ec3f9ef018b..da08af5946815 100755 --- a/data/data.json +++ b/data/data.json @@ -1,7 +1,7 @@ { - "lastUpdate": "2020/04/23", + "lastUpdate": "2020/04/26", "patients": { - "date": "2020/04/23", + "date": "2020/04/26", "data": [ { "リリース日": "2020-03-04T08:00:00.000Z", @@ -48,8 +48,8 @@ "居住地": "宮崎市", "年代": "10代", "性別": "女性", - "退院": "入院中", - "date": "2020-04-03" + "退院": "退院", + "date": "2020-04-２６" }, { "リリース日": "2020-04-05T08:00:00.000Z", @@ -64,8 +64,8 @@ "居住地": "宮崎市", "年代": "50代", "性別": "女性", - "退院": "入院中", - "date": "2020-04-04" + "退院": "退院", + "date": "2020-04-26" }, { "リリース日": "2020-04-05T08:00:00.000Z", From 434f3242db5cb6780c6c82099b99f74f215d3a8c Mon Sep 17 00:00:00 2001 From: koogawa Date: Sun, 26 Apr 2020 21:16:47 +0900 Subject: [PATCH 10/10] =?UTF-8?q?=E5=85=A5=E9=99=A2=E4=B8=AD=E3=81=AE?= =?UTF-8?q?=E4=BA=BA=E6=95=B0=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/data.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/data.json b/data/data.json index da08af5946815..1f05e1a884971 100755 --- a/data/data.json +++ b/data/data.json @@ -151,11 +151,11 @@ "children": [ { "attr": "入院中", - "value": 10, + "value": 8, "children": [ { "attr": "軽症・中等症", - "value": 10 + "value": 8 }, { "attr": "重症", @@ -165,7 +165,7 @@ }, { "attr": "退院", - "value": 7 + "value": 9 }, { "attr": "死亡",