Skip to content
This repository has been archived by the owner on Jun 1, 2023. It is now read-only.

Commit

Permalink
Merge branch 'development' into fix/sass-divide
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdmaster authored Jun 2, 2021
2 parents 4f206cb + 3e7673f commit ff9c1e8
Show file tree
Hide file tree
Showing 50 changed files with 13,540 additions and 10,821 deletions.
2 changes: 1 addition & 1 deletion FORKED_SITES.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
|[](17)石川県|https://ishikawa-covid19.netlify.app/|個人|[Retsuki/covid19-ishikawa/](https://github.com/Retsuki/covid19-ishikawa/)|**リンク切れ**|
|[](18)福井県|https://covid19-fukui.com/|地元有志(**福井県公認**|[nomunomu0504/covid19](https://github.com/nomunomu0504/covid19)||
|[](19)山梨県|https://stopcovid19.yamanashi.dev/|stopcovid19.yamanashi.devチーム|[covid19-yamanashi/covid19](https://github.com/covid19-yamanashi/covid19)||
|[](20)長野県|https://stop-covid19-nagano.netlify.app/|有志|[Stop-COVID19-Nagano/covid19](https://github.com/Stop-COVID19-Nagano/covid19)|**リンク切れ**|
|[](20)長野県|https://stop-covid19-nagano.netlify.app/|有志|[Stop-COVID19-Nagano/covid19](https://github.com/Stop-COVID19-Nagano/covid19)||
|[](20)長野県|https://covid19-nagano.info/|個人|[kanai3id/covid19](https://github.com/kanai3id/covid19)||
|[](21)岐阜県|https://covid19-gifu.netlify.app/|個人|[CODE-for-GIFU/covid19](https://github.com/CODE-for-GIFU/covid19)||
|[](22)静岡市|https://stopcovid19.city.shizuoka.lg.jp/|静岡市(**公式**|[kazuomatz/covid19](https://github.com/kazuomatz/covid19)||
Expand Down
10 changes: 8 additions & 2 deletions assets/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,12 @@
"{month}比 {rateWithArrow}": "{rateWithArrow} from {month}",
"新型コロナウイルス感染症が心配なときに.nav": "To those concerned about COVID-19",
"感染状況・医療提供体制(サマリ) {date}時点": "Infection situation and system for the provision of health care data summary (as of {date})",
"新規陽性者{newPositiveCases}人 / 検査数{tests}件({statisticDate}参考値 (3日間移動平均))、うち65歳以上の高齢者数{older65}人、死亡者数{deaths}人、都外からの持込検体による陽性数{samplesFromOutside}": "New positive cases {newPositiveCases} / Tests {tests} (Tested around {statisticDate} (Three-day moving average)), Of which {older65} are 65 or older, Deaths {deaths}, Positive cases from samples sent in from outside Tokyo {samplesFromOutside}",
"入院数{hospitalized}人(確保病床数{bedsSecured}床)、うち重症者数{severeCases}人(うち重症病床数{bedsSevereSymptoms}床)": "Hospitalized {hospitalized} (Beds secured {bedsSecured}), Of which {severeCases} are severe cases (Of which {bedsSevereSymptoms} are beds for patients with severe symptoms)"
"新規陽性者{newPositiveCases}人 / 検査数{tests}件({statisticDate}参考値 (3日間移動平均))、うち65歳以上の高齢者数{older65}人、死亡者数{deaths}人、都外からの持込検体による陽性数{samplesFromOutside}": "New positive cases {newPositiveCases} (of which {older65} are 65 or older) / Tests {tests} (Tested around ‎{statisticDate} (Three-day moving average)) / Deaths {deaths} / Positive cases from samples sent in from outside Tokyo {samplesFromOutside}",
"入院数{hospitalized}人(確保病床数{bedsSecured}床)、うち重症者数{severeCases}人(うち重症病床数{bedsSevereSymptoms}床)": "Hospitalized {hospitalized} (of which {severeCases} are severe cases) / Beds secured {bedsSecured} (of which {bedsSevereSymptoms} are beds for patients with severe symptoms)",
"接種回数(1回目・累計)": "接種回数(1回目・累計)",
"{dateEnd}累計値": " Cumulative total as of {dateEnd}",
"接種回数(2回目・累計)": "接種回数(2回目・累計)",
"対象者 約311万人": "対象者 約311万人",
"ワクチン接種記録システム(VRS)への報告を居住地の都道府県別に国が集計し、公表したものに基づき作成": "ワクチン接種記録システム(VRS)への報告を居住地の都道府県別に国が集計し、公表したものに基づき作成",
"ワクチン接種回数(高齢者・累計)": "ワクチン接種回数(高齢者・累計)"
}
8 changes: 7 additions & 1 deletion assets/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -786,5 +786,11 @@
"新型コロナウイルス感染症が心配なときに.nav": "新型コロナウイルス感染症が心配なときに.nav",
"感染状況・医療提供体制(サマリ) {date}時点": "感染状況・医療提供体制(サマリ) {date}時点",
"新規陽性者{newPositiveCases}人 / 検査数{tests}件({statisticDate}参考値 (3日間移動平均))、うち65歳以上の高齢者数{older65}人、死亡者数{deaths}人、都外からの持込検体による陽性数{samplesFromOutside}": "新規陽性者{newPositiveCases}人 / 検査数{tests}件({statisticDate}参考値 (3日間移動平均))、うち65歳以上の高齢者数{older65}人、死亡者数{deaths}人、都外からの持込検体による陽性数{samplesFromOutside}",
"入院数{hospitalized}人(確保病床数{bedsSecured}床)、うち重症者数{severeCases}人(うち重症病床数{bedsSevereSymptoms}床)": "入院数{hospitalized}人(確保病床数{bedsSecured}床)、うち重症者数{severeCases}人(うち重症病床数{bedsSevereSymptoms}床)"
"入院数{hospitalized}人(確保病床数{bedsSecured}床)、うち重症者数{severeCases}人(うち重症病床数{bedsSevereSymptoms}床)": "入院数{hospitalized}人(確保病床数{bedsSecured}床)、うち重症者数{severeCases}人(うち重症病床数{bedsSevereSymptoms}床)",
"接種回数(1回目・累計)": "接種回数(1回目・累計)",
"{dateEnd}累計値": "{dateEnd}累計値",
"接種回数(2回目・累計)": "接種回数(2回目・累計)",
"対象者 約311万人": "対象者 約311万人",
"ワクチン接種記録システム(VRS)への報告を居住地の都道府県別に国が集計し、公表したものに基づき作成": "ワクチン接種記録システム(VRS)への報告を居住地の都道府県別に国が集計し、公表したものに基づき作成",
"ワクチン接種回数(高齢者・累計)": "ワクチン接種回数(高齢者・累計)"
}
5 changes: 5 additions & 0 deletions audit-forked-sites/error.csv
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ timestamp,url,exists,status
2021-05-01T09:08:46+09:00,https://stopcovid19.pref.shiga.jp/,False,"[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: Hostname mismatch, certificate is not valid for 'stopcovid19.pref.shiga.jp'. (_ssl.c:1125)"
2021-05-01T09:08:56+09:00,https://covid19-kagawa.jp/,False,[Errno -2] Name or service not known
2021-05-01T09:08:57+09:00,https://covid19-kochi.netlify.app/,False,404
2021-06-01T09:26:13+09:00,https://yachiyo-covid19.netlify.app/,False,404
2021-06-01T09:26:17+09:00,https://ishikawa-covid19.netlify.app/,False,404
2021-06-01T09:26:31+09:00,https://stopcovid19.pref.shiga.jp/,False,"[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: Hostname mismatch, certificate is not valid for 'stopcovid19.pref.shiga.jp'. (_ssl.c:1131)"
2021-06-01T09:26:41+09:00,https://covid19-kagawa.jp/,False,[Errno -2] Name or service not known
2021-06-01T09:26:42+09:00,https://covid19-kochi.netlify.app/,False,404
7 changes: 7 additions & 0 deletions auto-i18n/result.csv
Original file line number Diff line number Diff line change
Expand Up @@ -801,3 +801,10 @@ TAG_ADD,感染状況・医療提供体制(サマリ) {date}時点
RUN,2021/05/28 15:32
TAG_ADD,新規陽性者{newPositiveCases}人 / 検査数{tests}件({statisticDate}参考値 (3日間移動平均))、うち65歳以上の高齢者数{older65}人、死亡者数{deaths}人、都外からの持込検体による陽性数{samplesFromOutside}
TAG_ADD,入院数{hospitalized}人(確保病床数{bedsSecured}床)、うち重症者数{severeCases}人(うち重症病床数{bedsSevereSymptoms}床)
RUN,2021/05/31 15:29
TAG_ADD,接種回数(1回目・累計)
TAG_ADD,{dateEnd}累計値
TAG_ADD,接種回数(2回目・累計)
TAG_ADD,対象者 約311万人
TAG_ADD,ワクチン接種記録システム(VRS)への報告を居住地の都道府県別に国が集計し、公表したものに基づき作成
TAG_ADD,ワクチン接種回数(高齢者・累計)
2 changes: 1 addition & 1 deletion components/_shared/SideNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ export default Vue.extend({
},
{
title: this.$t('新型コロナウイルスワクチンの接種について'),
link: 'https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronavaccine.html',
link: 'https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronavaccine/index.html',
},
{
title: this.$t(
Expand Down
6 changes: 5 additions & 1 deletion components/index/CardsReference.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ const TestedNumberCard = () =>
// N501Y変異株スクリーニングの実施状況
const VariantCard = () =>
import('@/components/index/CardsReference/Variant/Card.vue')
// ワクチン接種回数(高齢者・累計)
const VaccinationCard = () =>
import('@/components/index/CardsReference/Vaccination/Card.vue')
// 新型コロナコールセンター相談件数
const TelephoneAdvisoryReportsNumberCard = () =>
import(
Expand Down Expand Up @@ -68,7 +71,8 @@ export default Vue.extend({
[ConfirmedCasesAttributesCard, ConfirmedCasesByMunicipalitiesCard],
[PositiveNumberByDevelopedDateCard, PositiveNumberByDiagnosedDateCard],
[DeathsByDeathDateCard, TestedNumberCard],
[VariantCard, TelephoneAdvisoryReportsNumberCard],
[VariantCard, VaccinationCard],
[TelephoneAdvisoryReportsNumberCard],
[
MonitoringConsultationDeskReportsNumberCard,
TokyoFeverConsultationCenterReportsNumberCard,
Expand Down
141 changes: 141 additions & 0 deletions components/index/CardsReference/Vaccination/Card.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<template>
<v-col cols="12" md="6" class="DataCard VaccinationCard">
<client-only>
<chart
:title="$t('ワクチン接種回数(高齢者・累計)')"
title-id="vaccination"
:info-titles="[
$t('接種回数(1回目・累計)'),
$t('接種回数(2回目・累計)'),
]"
chart-id="vaccination-chart"
:chart-data="vaccinationData.chartData"
:get-formatter="getFormatter"
:date="date"
:labels="vaccinationData.labels"
:periods="vaccinationLabels"
:data-labels="chartLabels"
:last-period="vaccinationData.lastPeriod"
:unit="$t('')"
>
<template #description>
<span>{{ $t('対象者 約311万人') }}</span>
</template>
<template #additionalDescription>
<span>{{ $t('(注)') }}</span>
<ul>
<li>
{{
$t(
'ワクチン接種記録システム(VRS)への報告を居住地の都道府県別に国が集計し、公表したものに基づき作成'
)
}}
</li>
</ul>
</template>
</chart>
</client-only>
</v-col>
</template>

<script lang="ts">
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
import Vue from 'vue'
import Chart from '@/components/index/CardsReference/Vaccination/Chart.vue'
import {
Dataset as IVaccinationDataset,
Period as IVaccinationPeriod,
Vaccination as IVaccination,
} from '@/libraries/auto_generated/data_converter/convertVaccination'
import { getNumberToLocaleStringFunction } from '@/utils/monitoringStatusValueFormatters'
dayjs.extend(duration)
type Data = {
chartLabels: string[]
getFormatter: () => (d: number) => string | undefined
}
type Methods = {
getWeekEndLabel: (end: Date) => string
}
type Computed = {
date: string
vaccinationLabels: string[]
vaccinationDatasets: IVaccinationDataset[]
vaccinationData: {
lastPeriod: IVaccinationPeriod
labels: Date[]
chartData: number[][]
}
vaccination: IVaccination
}
type Props = {}
export default Vue.extend<Data, Methods, Computed, Props>({
components: {
Chart,
},
data() {
const chartLabels = [
this.$t('接種回数(1回目・累計)') as string,
this.$t('接種回数(2回目・累計)') as string,
]
const getFormatter = () => {
return getNumberToLocaleStringFunction()
}
return {
chartLabels,
getFormatter,
}
},
computed: {
date() {
return this.vaccination.date
},
vaccinationLabels() {
return this.vaccinationDatasets.map((dataset) => {
const { period } = dataset
const { end } = period
return this.getWeekEndLabel(end)
})
},
vaccinationDatasets() {
return this.vaccination.datasets
},
vaccinationData() {
const datasets = this.vaccination.datasets
const lastPeriod = datasets.slice(-1)[0].period
const labels = datasets.map((d: IVaccinationDataset) => d.period.end)
const cumulative1StDose: number[] = datasets.map(
(d: IVaccinationDataset) => d.data.cumulative1StDose
)
const cumulative2NdDose: number[] = datasets.map(
(d: IVaccinationDataset) => d.data.cumulative2NdDose
)
const chartData: number[][] = [cumulative1StDose, cumulative2NdDose]
return {
lastPeriod,
labels,
chartData,
}
},
vaccination() {
return this.$store.state.vaccination
},
},
methods: {
/**
* 表の横軸に表示する、「~MM/DD」形式のラベルを取得する
*/
getWeekEndLabel(end: Date) {
const to = this.$d(dayjs(end).toDate(), 'dateWithoutYear')
return `~${to}`
},
},
})
</script>
Loading

0 comments on commit ff9c1e8

Please sign in to comment.