From 5dbaf9388c069d2603454db8c319909da9efc85c Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Sat, 13 Feb 2021 18:18:24 +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 --- .../application/templates/application/page_layout.html | 6 +++--- .../rki_bundeslaender/rki_bundeslaender_imported.html | 2 +- .../templates/rki_landkreise/rki_landkreise_imported.html | 2 +- .../templates/rki_vaccination/rki_vaccination_data.html | 2 +- .../templates/rki_vaccination/rki_vaccination_import.html | 2 +- .../templates/who/date_reported/who_date_reported_one.html | 2 +- .../who_date_reported_one_cases_cumulative.html | 2 +- .../who/date_reported/who_date_reported_one_cases_new.html | 2 +- .../who_date_reported_one_deaths_cumulative.html | 2 +- .../who/date_reported/who_date_reported_one_deaths_new.html | 2 +- src/covid19/blueprints/who/templates/who/who_imported.html | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html index 8731c284..39cf9b27 100644 --- a/src/covid19/blueprints/application/templates/application/page_layout.html +++ b/src/covid19/blueprints/application/templates/application/page_layout.html @@ -13,13 +13,13 @@ <header> <div class="container tw_padding"> - {% include 'application/fragment_navbar.html' %} + {% include 'application/fragments/fragment_navbar.html' %} </div> </header> <section> <div class="container tw_padding"> - {% include 'application/fragment_navtabs.html' %} + {% include 'application/fragments/fragment_navtabs.html' %} </div> <div class="container"> {% block navigation_navtabs %}{% endblock %} @@ -31,7 +31,7 @@ <main> <div class="container tw_padding"> - {% include 'application/fragment_flashed_messages.html' %} + {% include 'application/fragments/fragment_flashed_messages.html' %} </div> <div class="container tw_padding"> {% block main_container %}{% endblock %} diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html index 63455306..5c9d5b97 100644 --- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html +++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_breadcrumb %} <!-- TODO: implement navigation_breadcrumb in .html --> diff --git a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html index bfdcf7f9..cb28f68e 100644 --- a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html +++ b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_breadcrumb %} <!-- TODO: implement navigation_breadcrumb in .html --> 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 6a37b465..b180188a 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 @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_breadcrumb %} <!-- TODO: implement navigation_breadcrumb in .html --> 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 6a37b465..b180188a 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 @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_breadcrumb %} <!-- TODO: implement navigation_breadcrumb in .html --> 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 17d942f0..dcdfeb81 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 @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_jumbotron %}{% endblock %} 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 03f5fd2a..1ed4ab5a 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 @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_jumbotron %}{% endblock %} 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 851847f5..374082fd 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 @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_jumbotron %}{% endblock %} 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 03f5fd2a..1ed4ab5a 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 @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_jumbotron %}{% endblock %} 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 6adaa45d..685ad739 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 @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_jumbotron %}{% endblock %} diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/covid19/blueprints/who/templates/who/who_imported.html index 1da77b87..8ecfb4bc 100644 --- a/src/covid19/blueprints/who/templates/who/who_imported.html +++ b/src/covid19/blueprints/who/templates/who/who_imported.html @@ -1,6 +1,6 @@ {% extends 'application/page_layout.html' %} -{% include 'application/fragment_pagination.html' %} +{% include 'application/fragments/fragment_pagination.html' %} {% block navigation_jumbotron %}{% endblock %} -- GitLab