benedikt/rki-impfparser
1
0
Fork 0
Code Releases Activity

feat: New information in Dashboard

Browse source
This commit is contained in:
Benedikt Bastin 2021-04-28 15:57:18 +02:00
parent ad67043b23
commit 548eebfc96
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dashboard_template.xhtml
View file

@ -19,6 +19,10 @@
Seit <em>{{ '{:n}'.format(data_second_vaccination.days_since_start).replace('.', ' ') }}</em> Tagen laufen die Zweitimpfungen. Seit <em>{{ '{:n}'.format(data_second_vaccination.days_since_start).replace('.', ' ') }}</em> Tagen laufen die Zweitimpfungen.
Bislang wurden <em>{{ '{:n}'.format(data_second_vaccination.total).replace('.', ' ') }}</em> Zweitimpfungen verabreicht, das entspricht einem Anteil von <em>{{ '{:.3n}'.format(data_second_vaccination.total_percentage) }} %</em> der Bevölkerung. Bislang wurden <em>{{ '{:n}'.format(data_second_vaccination.total).replace('.', ' ') }}</em> Zweitimpfungen verabreicht, das entspricht einem Anteil von <em>{{ '{:.3n}'.format(data_second_vaccination.total_percentage) }} %</em> der Bevölkerung.
</p> </p>
<p class="data-text">
Gestern wurden <em>{{ '{:n}'.format(data_first_vaccination.vaccinations_last_day).replace('.', ' ') }}</em> Erstimpfungen vorgenommen (<em>{{ '{:.3n}'.format(data_first_vaccination.vaccinations_last_day_percentage) }} %</em> der Bevölkerung, <em>{{ '{:.3n}'.format(data_first_vaccination.vaccinations_last_day_vaccination_percentage) }} %</em> der verabreichten Erstimpfdosen).
Innerhalb der letzten Kalenderwoche sind <em>{{ '{:.9n}'.format(data_first_vaccination.vaccinations_last_week).replace('.', ' ') }}</em> Erstimpfungen erfolgt (<em>{{ '{:.3n}'.format(data_first_vaccination.vaccinations_last_week_percentage) }} %</em>, <em>{{ '{:.3n}'.format(data_first_vaccination.vaccinations_last_week_vaccination_percentage) }} %</em>).
</p>
<p class="data-text"> <p class="data-text">
In den letzten sieben Tagen wurden durchschnittlich <em>{{ '{:n}'.format(data_first_vaccination['extrapolation_mean_seven_days']['rate_int']).replace('.', ' ') }}</em> Erstimpfungen und <em>{{ '{:n}'.format(data_second_vaccination['extrapolation_mean_seven_days']['rate_int']).replace('.', ' ') }}</em> Zweitimpfungen pro Tag vorgenommen (<em>{{ '{:n}'.format(data_first_vaccination['extrapolation_mean_seven_days']['rate_int'] * 7).replace('.', ' ') }}</em>/<em>{{ '{:n}'.format(data_second_vaccination['extrapolation_mean_seven_days']['rate_int'] * 7).replace('.', ' ') }}</em> pro Woche). In den letzten sieben Tagen wurden durchschnittlich <em>{{ '{:n}'.format(data_first_vaccination['extrapolation_mean_seven_days']['rate_int']).replace('.', ' ') }}</em> Erstimpfungen und <em>{{ '{:n}'.format(data_second_vaccination['extrapolation_mean_seven_days']['rate_int']).replace('.', ' ') }}</em> Zweitimpfungen pro Tag vorgenommen (<em>{{ '{:n}'.format(data_first_vaccination['extrapolation_mean_seven_days']['rate_int'] * 7).replace('.', ' ') }}</em>/<em>{{ '{:n}'.format(data_second_vaccination['extrapolation_mean_seven_days']['rate_int'] * 7).replace('.', ' ') }}</em> pro Woche).
Mit dieser Rate dauert es für die Erstimpfungen bis zum <em>{{ data_first_vaccination['extrapolation_mean_seven_days']['date_herd_immunity_str'] }}</em> für {{ herd_immunity }} % (<em>{{ data_first_vaccination['extrapolation_mean_seven_days']['weeks_extrapolated_herd_immunity'] }}</em> Wochen) und bis zum <em>{{ data_first_vaccination['extrapolation_mean_seven_days']['date_done_str'] }}</em> für 100 % (<em>{{ data_first_vaccination['extrapolation_mean_seven_days']['weeks_extrapolated'] }}</em> Wochen). Mit dieser Rate dauert es für die Erstimpfungen bis zum <em>{{ data_first_vaccination['extrapolation_mean_seven_days']['date_herd_immunity_str'] }}</em> für {{ herd_immunity }} % (<em>{{ data_first_vaccination['extrapolation_mean_seven_days']['weeks_extrapolated_herd_immunity'] }}</em> Wochen) und bis zum <em>{{ data_first_vaccination['extrapolation_mean_seven_days']['date_done_str'] }}</em> für 100 % (<em>{{ data_first_vaccination['extrapolation_mean_seven_days']['weeks_extrapolated'] }}</em> Wochen).

8
plot.py
View file

@ -161,7 +161,13 @@ def calculate_vaccination_data(data):
'vaccination_rates_daily_rolling_average': vaccination_rates_daily_rolling_average, 'vaccination_rates_daily_rolling_average': vaccination_rates_daily_rolling_average,
'vaccinations_missing_until_target': int(np.floor(vaccinations_missing_until_target)), 'vaccinations_missing_until_target': int(np.floor(vaccinations_missing_until_target)),
'vaccination_rate_needed_for_target': int(np.floor(vaccination_rate_needed_for_target)), 'vaccination_rate_needed_for_target': int(np.floor(vaccination_rate_needed_for_target)),
'vaccination_rate_needed_for_target_percentage': vaccination_rate_needed_for_target_percentage 'vaccination_rate_needed_for_target_percentage': vaccination_rate_needed_for_target_percentage,
'vaccinations_last_day': data.iloc[-1],
'vaccinations_last_day_percentage': data.iloc[-1] / einwohner_deutschland * 100,
'vaccinations_last_day_vaccination_percentage': data.iloc[-1] / total * 100,
'vaccinations_last_week': vaccinations_by_week[Week.thisweek() - 1],
'vaccinations_last_week_percentage': vaccinations_by_week[Week.thisweek() - 1] / einwohner_deutschland * 100,
'vaccinations_last_week_vaccination_percentage': vaccinations_by_week[Week.thisweek() - 1] / total * 100
} }
if 'Erstimpfung' in impfungen: if 'Erstimpfung' in impfungen:

2
site/rki-dashboard.css
View file

@ -25,7 +25,7 @@ p {
.data-text { .data-text {
color: #666666; color: #666666;
font-size: 2em; font-size: 1.6em;
font-weight: normal; font-weight: normal;
line-height: 1.75em; line-height: 1.75em;
} }