From e550e636e1499e3f1194ae71e203b9c331d0c0ae Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 21:48:08 +0100
Subject: [PATCH] ### 0.0.13 Release * Fixed #49
EuropeServiceUpdate.__update_data_short() (wontfix) * Fixed #52 download
vaccination timeline data file * Fixed #53 import vaccination timeline data
file into db * Fixed #54 /vaccination/imported * Fixed #57 frontend: use npm
for handling 3rdParty css and javascript modules like jQuery, Bootstrap *
Fixed #58 frontend: remove jumbotron from all pageheader, put jumbotron as
main content on home page * Fixed #47 major refactoring: Routes from app.py
to org...who,europe,... (Doublette von #65) * Fixed #48 major refactoring:
Tasks from server_mq.py to org...who,europe,... (Doublette von #65) * Fixed
#64 major refactoring: create two packages: for web app and for celery worker
* Issue #65 major refactoring: add flask-blueprints for admin, common,
europe, rki, vaccination, who
### 0.0.14 Release
* Issue #66 frontend: migrate to Bootstrap Theme sb-admin-angular
* Issue #67 implement Flask-Login
### 0.0.15 Release
* Issue #5 Visual Graphs for Data per Countries order by Date
* Issue #59 frontend: add correct breadcrumb to every page
* Issue #60 frontend: better design for tables
* Issue #61 frontend: better design for navtabs
* Issue #62 frontend: better design for pages
* Issue #63 frontend: add footer design
### 0.0.16 Release
* Issue #28 /admin/database/import
* Issue #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Issue #40 SQLalchemy instead of SQL: EuropeDataImportTable.get_date_rep()
* Issue #41 SQLalchemy instead of SQL: EuropeDataImportTable.get_countries_of_continent()
* Issue #42 SQLalchemy instead of SQL: WhoGlobalDataImportTable.get_new_dates_as_array()
---
covid19/blueprints/europe/europe_views.py | 50 +++++++++----------
.../continent/europe_continent_all.html | 6 +--
.../continent/europe_continent_germany.html | 6 +--
.../continent/europe_continent_one.html | 6 +--
.../europe/country/europe_country_all.html | 6 +--
.../country/europe_country_germany.html | 6 +--
.../europe/country/europe_country_one.html | 6 +--
.../europe_date_reported_all.html | 6 +--
.../europe_date_reported_one.html | 6 +--
...europe_date_reported_one_cases_weekly.html | 6 +--
...urope_date_reported_one_deaths_weekly.html | 6 +--
...e_date_reported_one_notification_rate.html | 6 +--
.../europe/templates/europe/europe_data.html | 6 +--
.../templates/europe/europe_imported.html | 6 +--
.../fragments/fragment_europe_table_data.html | 6 +--
.../vaccination_timeline_germany.html | 6 +--
.../vaccination/vaccination_service_import.py | 1 -
.../vaccination/vaccination_views.py | 10 ++--
18 files changed, 75 insertions(+), 76 deletions(-)
diff --git a/covid19/blueprints/europe/europe_views.py b/covid19/blueprints/europe/europe_views.py
index 72ba62f5..b67b93d3 100644
--- a/covid19/blueprints/europe/europe_views.py
+++ b/covid19/blueprints/europe/europe_views.py
@@ -47,7 +47,7 @@ def task_europe_update_short(self):
return result
-@app_europe.route('/europe/info')
+@app_europe.route('/info')
def url_europe_info():
page_info = ApplicationPage('Europe', "Info")
return render_template(
@@ -56,7 +56,7 @@ def url_europe_info():
page_info=page_info)
-@app_europe.route('/europe/tasks')
+@app_europe.route('/tasks')
def url_europe_tasks():
page_info = ApplicationPage('Europe', "Tasks")
return render_template(
@@ -65,7 +65,7 @@ def url_europe_tasks():
page_info=page_info)
-@app_europe.route('/europe/update/initial')
+@app_europe.route('/update/initial')
def europe_update_data():
europe_service.download()
task_europe_update_initial.apply_async()
@@ -73,8 +73,8 @@ def europe_update_data():
return redirect(url_for('url_home'))
-@app_europe.route('/europe/imported/page/<int:page>')
-@app_europe.route('/europe/imported')
+@app_europe.route('/imported/page/<int:page>')
+@app_europe.route('/imported')
def url_europe_data_imported(page=1):
page_info = ApplicationPage('Europe', "Last Import")
page_data = EuropeDataImportTable.get_all_as_page(page)
@@ -84,8 +84,8 @@ def url_europe_data_imported(page=1):
page_info=page_info)
-@app_europe.route('/europe/date_reported/all/page/<int:page>')
-@app_europe.route('/europe/date_reported/all')
+@app_europe.route('/date_reported/all/page/<int:page>')
+@app_europe.route('/date_reported/all')
def url_europe_date_reported_all(page=1):
page_info = ApplicationPage('Europe', "date_reported")
page_data = EuropeDateReported.get_all_as_page(page)
@@ -95,10 +95,10 @@ def url_europe_date_reported_all(page=1):
page_info=page_info)
-@app_europe.route('/europe/date_reported/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/europe/date_reported/<int:europe_date_reported_id>')
-@app_europe.route('/europe/date_reported/notification_rate/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/europe/date_reported/notification_rate/<int:europe_date_reported_id>')
+@app_europe.route('/date_reported/<int:europe_date_reported_id>/page/<int:page>')
+@app_europe.route('/date_reported/<int:europe_date_reported_id>')
+@app_europe.route('/date_reported/notification_rate/<int:europe_date_reported_id>/page/<int:page>')
+@app_europe.route('/date_reported/notification_rate/<int:europe_date_reported_id>')
def url_europe_date_reported_one_notification_rate(europe_date_reported_id, page=1):
page_info = ApplicationPage('Europe', "date_reported")
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
@@ -110,8 +110,8 @@ def url_europe_date_reported_one_notification_rate(europe_date_reported_id, page
page_info=page_info)
-@app_europe.route('/europe/date_reported/deaths_weekly/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/europe/date_reported/deaths_weekly/<int:europe_date_reported_id>')
+@app_europe.route('/date_reported/deaths_weekly/<int:europe_date_reported_id>/page/<int:page>')
+@app_europe.route('/date_reported/deaths_weekly/<int:europe_date_reported_id>')
def url_europe_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
page_info = ApplicationPage('Europe', "date_reported")
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
@@ -123,8 +123,8 @@ def url_europe_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
page_info=page_info)
-@app_europe.route('/europe/date_reported/cases_weekly/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/europe/date_reported/cases_weekly/<int:europe_date_reported_id>')
+@app_europe.route('/date_reported/cases_weekly/<int:europe_date_reported_id>/page/<int:page>')
+@app_europe.route('/date_reported/cases_weekly/<int:europe_date_reported_id>')
def url_europe_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
page_info = ApplicationPage('Europe', "date_reported")
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
@@ -136,8 +136,8 @@ def url_europe_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
page_info=page_info)
-@app_europe.route('/europe/continent/all/page/<int:page>')
-@app_europe.route('/europe/continent/all')
+@app_europe.route('/continent/all/page/<int:page>')
+@app_europe.route('/continent/all')
def url_europe_continent_all(page=1):
page_info = ApplicationPage('Europe', "continent")
page_data = EuropeContinent.get_all_as_page(page)
@@ -147,8 +147,8 @@ def url_europe_continent_all(page=1):
page_info=page_info)
-@app_europe.route('/europe/continent/<int:continent_id>/page/<int:page>')
-@app_europe.route('/europe/continent/<int:continent_id>')
+@app_europe.route('/continent/<int:continent_id>/page/<int:page>')
+@app_europe.route('/continent/<int:continent_id>')
def url_europe_continent_one(continent_id, page=1):
page_info = ApplicationPage('Europe', "continent")
continent = EuropeContinent.get_by_id(continent_id)
@@ -160,8 +160,8 @@ def url_europe_continent_one(continent_id, page=1):
page_info=page_info)
-@app_europe.route('/europe/country/all/page/<int:page>')
-@app_europe.route('/europe/country/all')
+@app_europe.route('/country/all/page/<int:page>')
+@app_europe.route('/country/all')
def url_europe_country_all(page=1):
page_info = ApplicationPage('Europe', "country")
page_data = EuropeCountry.get_all_as_page(page)
@@ -171,8 +171,8 @@ def url_europe_country_all(page=1):
page_info=page_info)
-@app_europe.route('/europe/country/<int:country_id>/page/<int:page>')
-@app_europe.route('/europe/country/<int:country_id>')
+@app_europe.route('/country/<int:country_id>/page/<int:page>')
+@app_europe.route('/country/<int:country_id>')
def url_europe_country_one(country_id, page=1):
page_info = ApplicationPage('Europe', "country")
europe_country = EuropeCountry.get_by_id(country_id)
@@ -184,8 +184,8 @@ def url_europe_country_one(country_id, page=1):
page_info=page_info)
-@app_europe.route('/europe/country/germany/page/<int:page>')
-@app_europe.route('/europe/country/germany')
+@app_europe.route('/country/germany/page/<int:page>')
+@app_europe.route('/country/germany')
def url_europe_country_germany(page=1):
page_info = ApplicationPage('Europe', "country: Germany")
europe_country = EuropeCountry.get_germany()
diff --git a/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
index ae1c59b8..9253e824 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
@@ -21,7 +21,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent_all', page=page_data.prev_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent_all', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent_all', page=page_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent_all', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -49,7 +49,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent_all', page=page_data.next_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent_all', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
index e3c8dbb9..9eb4e35a 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
@@ -21,7 +21,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent', page=page_data.prev_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent', page=page_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -49,7 +49,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent', page=page_data.next_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
index 40f0d16c..d944415b 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
@@ -21,7 +21,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent_one', continent_id=continent.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent_one', continent_id=continent.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent_one', continent_id=continent.id, page=page_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent_one', continent_id=continent.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -49,7 +49,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_continent_one', continent_id=continent.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'europe.url_europe_continent_one', continent_id=continent.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/covid19/blueprints/europe/templates/europe/country/europe_country_all.html b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
index b779f911..23adee3f 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
@@ -21,7 +21,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_all', page=page_data.prev_num) }}">
+ href="{{ url_for( 'europe.url_europe_country_all', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_all', page=page_num) }}">
+ href="{{ url_for( 'europe.url_europe_country_all', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -49,7 +49,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_all', page=page_data.next_num) }}">
+ href="{{ url_for( 'europe.url_europe_country_all', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
index 603cc87d..fb8b7bc2 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
@@ -11,7 +11,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_germany', page=page_data.prev_num) }}">
+ href="{{ url_for( 'europe.url_europe_country_germany', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -21,7 +21,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_germany', page=page_num) }}">
+ href="{{ url_for( 'europe.url_europe_country_germany', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -39,7 +39,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_germany', page=page_data.next_num) }}">
+ href="{{ url_for( 'europe.url_europe_country_germany', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/covid19/blueprints/europe/templates/europe/country/europe_country_one.html b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
index 4cdf7182..e47d2a98 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
@@ -11,7 +11,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_one',
+ href="{{ url_for( 'europe.url_europe_country_one',
country_id=europe_country.id,
page=page_data.prev_num) }}">
Previous
@@ -23,7 +23,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_one',
+ href="{{ url_for( 'europe.url_europe_country_one',
country_id=europe_country.id,
page=page_num) }}">
{{ page_num }}
@@ -43,7 +43,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_country_one',
+ href="{{ url_for( 'europe.url_europe_country_one',
country_id=europe_country.id, page=page_data.next_num) }}">
Next
</a>
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
index 0124a4fc..ea45fa67 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
@@ -21,7 +21,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_all', page=page_data.prev_num) }}">
+ href="{{ url_for( 'europe.url_europe_date_reported_all', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_all', page=page_num) }}">
+ href="{{ url_for( 'europe.url_europe_date_reported_all', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -49,7 +49,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_all', page=page_data.next_num) }}">
+ href="{{ url_for( 'europe.url_europe_date_reported_all', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
index a5468298..b40f27e3 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
@@ -14,7 +14,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one',
+ href="{{ url_for( 'europe.url_europe_date_reported_one',
europe_date_reported_id=europe_date_reported.id,
page=page_data.prev_num) }}">
Previous
@@ -26,7 +26,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one',
+ href="{{ url_for( 'europe.url_europe_date_reported_one',
europe_date_reported_id=europe_date_reported.id,
page=page_num) }}">
{{ page_num }}
@@ -46,7 +46,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one',
+ href="{{ url_for( 'europe.url_europe_date_reported_one',
europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
Next
</a>
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
index 2526106f..e51d5c51 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
@@ -14,7 +14,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_cases_weekly',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_cases_weekly',
europe_date_reported_id=europe_date_reported.id,
page=page_data.prev_num) }}">
Previous
@@ -26,7 +26,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_cases_weekly',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_cases_weekly',
europe_date_reported_id=europe_date_reported.id,
page=page_num) }}">
{{ page_num }}
@@ -46,7 +46,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_cases_weekly',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_cases_weekly',
europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
Next
</a>
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
index 12ac115c..55dd0fdb 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
@@ -14,7 +14,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_deaths_weekly',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_deaths_weekly',
europe_date_reported_id=europe_date_reported.id,
page=page_data.prev_num) }}">
Previous
@@ -26,7 +26,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_deaths_weekly',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_deaths_weekly',
europe_date_reported_id=europe_date_reported.id,
page=page_num) }}">
{{ page_num }}
@@ -46,7 +46,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_deaths_weekly',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_deaths_weekly',
europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
Next
</a>
diff --git a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
index dd2a5d23..579a03fa 100644
--- a/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
+++ b/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
@@ -14,7 +14,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_notification_rate',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_notification_rate',
europe_date_reported_id=europe_date_reported.id,
page=page_data.prev_num) }}">
Previous
@@ -26,7 +26,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_notification_rate',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_notification_rate',
europe_date_reported_id=europe_date_reported.id,
page=page_num) }}">
{{ page_num }}
@@ -46,7 +46,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_date_reported_one_notification_rate',
+ href="{{ url_for( 'europe.url_europe_date_reported_one_notification_rate',
europe_date_reported_id=europe_date_reported.id, page=page_data.next_num) }}">
Next
</a>
diff --git a/covid19/blueprints/europe/templates/europe/europe_data.html b/covid19/blueprints/europe/templates/europe/europe_data.html
index 548cdf07..c45e9391 100644
--- a/covid19/blueprints/europe/templates/europe/europe_data.html
+++ b/covid19/blueprints/europe/templates/europe/europe_data.html
@@ -21,7 +21,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_data', page=page_data.prev_num) }}">
+ href="{{ url_for( 'europe.url_europe_data', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -31,7 +31,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_data', page=page_num) }}">
+ href="{{ url_for( 'europe.url_europe_data', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -49,7 +49,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_europe_data', page=page_data.next_num) }}">
+ href="{{ url_for( 'europe.url_europe_data', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/covid19/blueprints/europe/templates/europe/europe_imported.html b/covid19/blueprints/europe/templates/europe/europe_imported.html
index a2159a28..4b0abaa1 100644
--- a/covid19/blueprints/europe/templates/europe/europe_imported.html
+++ b/covid19/blueprints/europe/templates/europe/europe_imported.html
@@ -23,7 +23,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_europe_data_imported', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('europe.url_europe_data_imported', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -31,7 +31,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_europe_data_imported', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('europe.url_europe_data_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -47,7 +47,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_europe_data_imported', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('europe.url_europe_data_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html
index bcc9355d..8589140d 100644
--- a/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html
+++ b/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html
@@ -5,7 +5,7 @@
<th scope="col">year_week</th>
<th scope="col">
{% if europe_date_reported %}
- <a href="{{ url_for( 'url_europe_date_reported_one_deaths_weekly',
+ <a href="{{ url_for( 'europe.url_europe_date_reported_one_deaths_weekly',
europe_date_reported_id=europe_date_reported.id,
page=page_data.page) }}">
deaths weekly
@@ -17,7 +17,7 @@
</th>
<th scope="col">
{% if europe_date_reported %}
- <a href="{{ url_for( 'url_europe_date_reported_one_cases_weekly',
+ <a href="{{ url_for( 'europe.url_europe_date_reported_one_cases_weekly',
europe_date_reported_id=europe_date_reported.id,
page=page_data.page) }}">
cases weekly
@@ -29,7 +29,7 @@
</th>
<th scope="col">
{% if europe_date_reported %}
- <a href="{{ url_for( 'url_europe_date_reported_one_notification_rate',
+ <a href="{{ url_for( 'europe.url_europe_date_reported_one_notification_rate',
europe_date_reported_id=europe_date_reported.id,
page=page_data.page) }}">
notification rate per 100000 population 14days
diff --git a/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
index fe8e7949..8d827f8b 100644
--- a/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
+++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
@@ -19,7 +19,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_vaccination_timeline_germany', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('vaccination.url_vaccination_timeline_germany', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -27,7 +27,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_vaccination_timeline_germany', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('vaccination.url_vaccination_timeline_germany', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -43,7 +43,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_vaccination_timeline_germany', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('vaccination.url_vaccination_timeline_germany', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/vaccination/vaccination_service_import.py b/covid19/blueprints/vaccination/vaccination_service_import.py
index db605158..c9e4d56f 100644
--- a/covid19/blueprints/vaccination/vaccination_service_import.py
+++ b/covid19/blueprints/vaccination/vaccination_service_import.py
@@ -14,7 +14,6 @@ class VaccinationServiceImport:
app.logger.debug("------------------------------------------------------------")
self.__database = database
self.cfg = VaccinationServiceDownloadConfig()
- self.__url_src_data = "https://impfdashboard.de/static/data/germany_vaccinations_timeseries_v2.tsv"
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Vaccination Service Import [ready]")
diff --git a/covid19/blueprints/vaccination/vaccination_views.py b/covid19/blueprints/vaccination/vaccination_views.py
index 4938d3d3..5bd3e9f2 100644
--- a/covid19/blueprints/vaccination/vaccination_views.py
+++ b/covid19/blueprints/vaccination/vaccination_views.py
@@ -33,7 +33,7 @@ def task_vaccination_update_initial(self):
return result
-@app.route('/vaccination/info')
+@app.route('/info')
def url_vaccination_info():
page_info = ApplicationPage('Vaccination', "Info")
return render_template(
@@ -41,7 +41,7 @@ def url_vaccination_info():
page_info=page_info)
-@app.route('/vaccination/tasks')
+@app.route('/tasks')
def url_vaccination_tasks():
page_info = ApplicationPage('Vaccination', "Tasks")
return render_template(
@@ -49,7 +49,7 @@ def url_vaccination_tasks():
page_info=page_info)
-@app.route('/vaccination/update/initial')
+@app.route('/update/initial')
def url_vaccination_update_data():
vaccination_service.run_download()
flash("vaccination_service.run_download done")
@@ -58,8 +58,8 @@ def url_vaccination_update_data():
return redirect(url_for('url_vaccination_tasks'))
-@app.route('/vaccination/timeline/germany/page/<int:page>')
-@app.route('/vaccination/timeline/germany')
+@app.route('/timeline/germany/page/<int:page>')
+@app.route('/timeline/germany')
def url_vaccination_timeline_germany(page=1):
page_info = ApplicationPage('Vaccination', "Germany Timeline")
page_data = VaccinationGermanyTimeline.get_all_as_page(page)
--
GitLab