From b6e1f073a933e6536417d65a8c89eeb5e251395a Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 13 Feb 2021 20:49:39 +0100
Subject: [PATCH] * Fixed #123 split RkiBundeslaenderService into two Services,
one for bundeslaender and one for landkreise * Fixed #128 add fields from csv
to RkiLandkreiseImport * Fixed #139 refactor RkiBundeslaenderServiceDownload
to new method scheme introduced 07.02.2021 * Fixed #140 move WhoImport to RKI
in: rk_service_import.py * Fixed #125 implement RkiLandkreise * Fixed #126
implement RkiBundeslaenderImport
---
.../ecdc/templates/ecdc/continent/ecdc_continent_all.html | 2 +-
.../ecdc/templates/ecdc/continent/ecdc_continent_germany.html | 2 +-
.../ecdc/templates/ecdc/continent/ecdc_continent_one.html | 2 +-
.../ecdc/templates/ecdc/country/ecdc_country_all.html | 2 +-
.../ecdc/templates/ecdc/country/ecdc_country_germany.html | 2 +-
.../ecdc/templates/ecdc/country/ecdc_country_one.html | 2 +-
.../templates/ecdc/date_reported/ecdc_date_reported_all.html | 2 +-
.../templates/ecdc/date_reported/ecdc_date_reported_one.html | 2 +-
.../ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html | 2 +-
.../date_reported/ecdc_date_reported_one_deaths_weekly.html | 2 +-
.../date_reported/ecdc_date_reported_one_notification_rate.html | 2 +-
src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html | 2 +-
src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html | 2 +-
.../templates/rki_vaccination/rki_vaccination_data.html | 2 +-
.../templates/rki_vaccination/rki_vaccination_import.html | 2 +-
.../blueprints/who/templates/who/country/who_country_all.html | 2 +-
.../who/templates/who/country/who_country_germany.html | 2 +-
.../blueprints/who/templates/who/country/who_country_one.html | 2 +-
.../templates/who/country/who_country_one_cases_cumulative.html | 2 +-
.../who/templates/who/country/who_country_one_cases_new.html | 2 +-
.../who/country/who_country_one_deaths_cumulative.html | 2 +-
.../who/templates/who/country/who_country_one_deaths_new.html | 2 +-
.../who/templates/who/date_reported/who_date_reported_all.html | 2 +-
.../who/templates/who/date_reported/who_date_reported_one.html | 2 +-
.../date_reported/who_date_reported_one_cases_cumulative.html | 2 +-
.../who/date_reported/who_date_reported_one_cases_new.html | 2 +-
.../date_reported/who_date_reported_one_deaths_cumulative.html | 2 +-
.../who/date_reported/who_date_reported_one_deaths_new.html | 2 +-
.../blueprints/who/templates/who/region/who_region_all.html | 2 +-
.../blueprints/who/templates/who/region/who_region_one.html | 2 +-
src/covid19/blueprints/who/templates/who/who_imported.html | 2 +-
31 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
index 7b2d2517..e655f7d4 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
@@ -15,7 +15,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
index 07a8b506..e504c49d 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_germany.html
@@ -15,7 +15,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
index 7b76e1e7..106e8766 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
@@ -15,7 +15,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
index e8fc730b..3d27dc10 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
@@ -15,7 +15,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
index d614b2c5..827e137a 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
@@ -5,7 +5,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
index 83a7bcd6..5e63ff84 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
@@ -5,7 +5,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
index 8d568432..6c94420f 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
@@ -15,7 +15,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
index eebf92a4..8fa142e8 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
@@ -8,7 +8,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
index c6dea641..c7623991 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
@@ -8,7 +8,7 @@
{% include 'europe/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
index 3c626d4e..e9ea4734 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
@@ -8,7 +8,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
index 29fc133d..92cc888c 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
@@ -8,7 +8,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
index 822ac507..e3b08872 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
@@ -15,7 +15,7 @@
{% include 'ecdc/fragments/fragment_ecdc_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
index bd04c539..95c7e93b 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
@@ -17,7 +17,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
index 2c7cc7d8..d55077b3 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
@@ -12,7 +12,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
index 1d77a781..14035458 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
@@ -12,7 +12,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_all.html b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
index 640fb689..2d18752f 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_all.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
@@ -16,7 +16,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
index 8545e436..000c8eb8 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
@@ -25,7 +25,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one.html b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
index 31f7c4a3..fd082343 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
@@ -17,7 +17,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
index ded2572d..16560b6c 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
@@ -17,7 +17,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
index 05e6d030..175669c6 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
@@ -17,7 +17,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
index 819cecdf..7a6d467c 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
@@ -17,7 +17,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
index ec22097e..450be616 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
@@ -17,7 +17,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index fd58835e..300ada40 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
@@ -16,7 +16,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index dcdfeb81..80399b09 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
@@ -20,7 +20,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index 1ed4ab5a..0446e170 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
@@ -20,7 +20,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index 374082fd..cba18a8f 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
@@ -20,7 +20,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index 1ed4ab5a..0446e170 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
@@ -20,7 +20,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index 685ad739..a956d974 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
@@ -20,7 +20,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_all.html b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
index d39ad83b..e0bf8a3c 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_all.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
@@ -16,7 +16,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
<ul class="pagination">
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_one.html b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
index 0014aa6c..28909bdb 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_one.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
@@ -17,7 +17,7 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/covid19/blueprints/who/templates/who/who_imported.html
index 8ecfb4bc..f9cd325d 100644
--- a/src/covid19/blueprints/who/templates/who/who_imported.html
+++ b/src/covid19/blueprints/who/templates/who/who_imported.html
@@ -15,7 +15,7 @@
{% endblock %}
-{% block main_container_fluid %}
+{% block main_container %}
{% if page_data.pages > 1 %}
<!-- previous page -->
--
GitLab