diff --git a/dashboard_template.xhtml b/dashboard_template.xhtml
index ffc632d..ad46826 100644
--- a/dashboard_template.xhtml
+++ b/dashboard_template.xhtml
@@ -209,6 +209,19 @@
Download als PDF
+
diff --git a/plot.py b/plot.py
index f9b7a44..b6df546 100644
--- a/plot.py
+++ b/plot.py
@@ -369,9 +369,9 @@ def plot_vaccination_bar_graph_total_time_two_bars():
archive_plot_filename = '{}/vaccination_bar_graph_total_time_two_bars'.format(archive_folder)
latest_plot_filename = '{}/vaccination_bar_graph_total_time_two_bars'.format(site_folder)
- #if os.path.isfile(archive_plot_filename + '.pdf'):
- #print('Plot {} already exists'.format(archive_plot_filename))
- #return
+ if os.path.isfile(archive_plot_filename + '.pdf'):
+ print('Plot {} already exists'.format(archive_plot_filename))
+ return
fig, ax = plt.subplots(1)
@@ -410,6 +410,53 @@ def plot_vaccination_bar_graph_total_time_two_bars():
plot_vaccination_bar_graph_total_time_two_bars()
+def plot_vaccination_bar_graph_compare_both_vaccinations():
+
+ archive_plot_filename = '{}/vaccination_bar_graph_compare_both_vaccinations'.format(archive_folder)
+ latest_plot_filename = '{}/vaccination_bar_graph_compare_both_vaccinations'.format(site_folder)
+
+ if os.path.isfile(archive_plot_filename + '.pdf'):
+ print('Plot {} already exists'.format(archive_plot_filename))
+ return
+
+ fig, ax = plt.subplots(1)
+
+
+ plt.title(
+ 'Tägliche Impfrate (Erst- und Zweitimpfung um 21 Tage versetzt)\n'
+ 'Datenquelle: RKI, Stand: {}. Erstellung: {}, Ersteller: Benedikt Bastin, Lizenz: CC BY-SA 4.0\n'.format(
+ print_stand, print_today
+ )
+ )
+
+ ax.grid()
+
+ date_numbers_first = date2num(dates + datetime.timedelta(days=21))
+ date_numbers_second = date2num(dates)
+
+ ax.bar(date_numbers_first - 0.2, data_first_vaccination['daily'], width=0.4, label='Tägliche Erstimpfungen', color='blue')
+ ax.bar(date_numbers_second + 0.2, data_second_vaccination['daily'], width=0.4, label='Tägliche Zweitimpfungen', color='lightblue')
+
+ ax.set_ylim([0, np.max([np.max(data_first_vaccination['daily']), np.max(data_second_vaccination['daily'])])])
+
+ ax.legend(loc='upper left')
+ ax.xaxis_date()
+ ax.get_yaxis().get_major_formatter().set_scientific(False)
+
+ ax.set_xlabel('Datum')
+ ax.set_ylabel('Tägliche Impfungen')
+
+
+ plt.savefig(archive_plot_filename + '.pdf')
+ plt.savefig(archive_plot_filename + '.png')
+ plt.savefig(latest_plot_filename + '.pdf')
+ plt.savefig(latest_plot_filename + '.png')
+ plt.close()
+
+ print('Created plot {} as pdf and png'.format(archive_plot_filename))
+
+plot_vaccination_bar_graph_compare_both_vaccinations()
+
def render_dashboard():
dashboard_filename = 'site/index.xhtml'
dashboard_archive_filename = 'site/archive/{}/index.xhtml'.format(filename_stand)