feat: Added plot for cumulative vaccinations

dashboard_template.xhtml

@@ -203,12 +203,38 @@
 						alt="" />
 				</a>
 				<figcaption>
-					<a name="figure-004"><span class="ref">Abbildung 4:</span></a>
+					<a name="figure-005"><span class="ref">Abbildung 5:</span></a>
 					Tägliche Impfrate (Erst- und Zweitimpfung nebeneinander)<br />
 					<a href="vaccination_bar_graph_total_time_two_bars.png" download="vaccination_bar_graph_total_time_two_bars.png">Download als PNG</a>
 					<a href="vaccination_bar_graph_total_time_two_bars.pdf" download="vaccination_bar_graph_total_time_two_bars.pdf">Download als PDF</a>
 				</figcaption>
 			</figure>
+			<figure>
+				<a href="vaccination_bar_graph_compare_both_vaccinations.png">
+					<img
+						src="vaccination_bar_graph_compare_both_vaccinations.png"
+						alt="" />
+				</a>
+				<figcaption>
+					<a name="figure-006"><span class="ref">Abbildung 6:</span></a>
+					Tägliche Impfrate (Erst- und Zweitimpfung nebeneinander)<br />
+					<a href="vaccination_bar_graph_compare_both_vaccinations.png" download="vaccination_bar_graph_compare_both_vaccinations.png">Download als PNG</a>
+					<a href="vaccination_bar_graph_compare_both_vaccinations.pdf" download="vaccination_bar_graph_compare_both_vaccinations.pdf">Download als PDF</a>
+				</figcaption>
+			</figure>
+			<figure>
+				<a href="cumulative_two_vaccinations.png">
+					<img
+						src="cumulative_two_vaccinations.png"
+						alt="" />
+				</a>
+				<figcaption>
+					<a name="figure-006"><span class="ref">Abbildung 6:</span></a>
+					Tägliche Impfrate (Erst- und Zweitimpfung nebeneinander)<br />
+					<a href="cumulative_two_vaccinations.png" download="cumulative_two_vaccinations.png">Download als PNG</a>
+					<a href="cumulative_two_vaccinations.pdf" download="cumulative_two_vaccinations.pdf">Download als PDF</a>
+				</figcaption>
+			</figure>
 		</section>
 
 		<section>

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'):
+	if os.path.isfile(archive_plot_filename + '.pdf'):
-		#print('Plot {} already exists'.format(archive_plot_filename))
+		print('Plot {} already exists'.format(archive_plot_filename))
-		#return
+		return
 
 	fig, ax = plt.subplots(1)
 
@@ -410,6 +410,100 @@ 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 plot_cumulative_two_vaccinations():
+	archive_plot_filename = '{}/cumulative_two_vaccinations'.format(archive_folder)
+	latest_plot_filename = '{}/cumulative_two_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(
+		'Kumulative Impfrate (Erst- und Zweitimpfung)\n'
+			'Datenquelle: RKI, Stand: {}. Erstellung: {}, Ersteller: Benedikt Bastin, Lizenz: CC BY-SA 4.0\n'.format(
+			print_stand, print_today
+		)
+	)
+
+	ax.grid()
+
+	first_vaccinations_cumulative = data_first_vaccination['cumulative']
+	second_vaccinations_cumulative = data_second_vaccination['cumulative']
+
+	ax.fill_between(dates, first_vaccinations_cumulative, label='Erstimpfungen', color='blue')
+	ax.fill_between(dates, second_vaccinations_cumulative, label='Zweitimpfungen', color='lightblue')
+
+	ax.set_ylim([0, first_vaccinations_cumulative.iloc[-1]])
+
+	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_cumulative_two_vaccinations()
+
 def render_dashboard():
 	dashboard_filename = 'site/index.xhtml'
 	dashboard_archive_filename = 'site/archive/{}/index.xhtml'.format(filename_stand)