From 835dc05ce9daed4e1c2b320765720c7ba9212299 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 21:34:23 +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()
---
.../continent/europe_continent_all.html | 4 +-
.../continent/europe_continent_germany.html | 4 +-
.../continent/europe_continent_one.html | 4 +-
.../europe/country/europe_country_all.html | 4 +-
.../country/europe_country_germany.html | 4 +-
.../europe/country/europe_country_one.html | 4 +-
.../europe_date_reported_all.html | 4 +-
.../europe_date_reported_one.html | 4 +-
...europe_date_reported_one_cases_weekly.html | 4 +-
...urope_date_reported_one_deaths_weekly.html | 4 +-
...e_date_reported_one_notification_rate.html | 4 +-
.../europe/templates/europe/europe_data.html | 4 +-
.../templates/europe/europe_imported.html | 4 +-
.../europe/templates/europe/europe_info.html | 2 +-
.../europe/templates/europe/europe_tasks.html | 2 +-
covid19/blueprints/rki/rki_views.py | 14 +--
.../rki/templates/rki/rki_imported.html | 6 +-
.../rki/templates/rki/rki_tasks.html | 6 +-
.../vaccination_timeline_germany.html | 2 +-
.../who/country/who_country_all.html | 10 +-
.../who/country/who_country_germany.html | 10 +-
.../who/country/who_country_one.html | 10 +-
.../who_country_one_cases_cumulative.html | 10 +-
.../country/who_country_one_cases_new.html | 10 +-
.../who_country_one_deaths_cumulative.html | 10 +-
.../country/who_country_one_deaths_new.html | 10 +-
.../date_reported/who_date_reported_all.html | 8 +-
.../date_reported/who_date_reported_one.html | 10 +-
...ho_date_reported_one_cases_cumulative.html | 10 +-
.../who_date_reported_one_cases_new.html | 10 +-
...o_date_reported_one_deaths_cumulative.html | 10 +-
.../who_date_reported_one_deaths_new.html | 10 +-
.../templates/who/region/who_region_all.html | 8 +-
.../templates/who/region/who_region_one.html | 10 +-
.../who/templates/who/who_imported.html | 8 +-
.../who/templates/who/who_info.html | 2 +-
.../who/templates/who/who_tasks.html | 2 +-
covid19/blueprints/who/who_views.py | 110 +++++++++---------
38 files changed, 176 insertions(+), 176 deletions(-)
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 c32f8575..ae1c59b8 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_continent.html' %}
+ {% include 'europe/fragments/fragment_europe_table_continent.html' %}
{% endblock %}
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 3e16b8be..e3c8dbb9 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/fragment_europe_table_country.html' %}
{% endblock %}
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 d80e6d7e..40f0d16c 100644
--- a/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
+++ b/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/fragment_europe_table_country.html' %}
{% endblock %}
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 e902e4df..b779f911 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_country.html' %}
+ {% include 'europe/fragments/fragment_europe_table_country.html' %}
{% endblock %}
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 b0f92e66..603cc87d 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
@@ -1,7 +1,7 @@
{% extends 'common/page_layout.html' %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -47,7 +47,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
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 2e01bb29..4cdf7182 100644
--- a/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
+++ b/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
@@ -1,7 +1,7 @@
{% extends 'common/page_layout.html' %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -52,7 +52,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
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 0b3cd118..0124a4fc 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
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_date_reported.html' %}
+ {% include 'europe/fragments/fragment_europe_table_date_reported.html' %}
{% endblock %}
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 eb6c8418..a5468298 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
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
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 bc4fa5c1..2526106f 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
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
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 b8d31dc0..12ac115c 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
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
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 2bd48023..dd2a5d23 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
@@ -4,7 +4,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/../fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -55,7 +55,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/../fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_data.html b/covid19/blueprints/europe/templates/europe/europe_data.html
index 504ac784..548cdf07 100644
--- a/covid19/blueprints/europe/templates/europe/europe_data.html
+++ b/covid19/blueprints/europe/templates/europe/europe_data.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -57,7 +57,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragments/fragment_europe_table_data.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_imported.html b/covid19/blueprints/europe/templates/europe/europe_imported.html
index a4e10c84..a2159a28 100644
--- a/covid19/blueprints/europe/templates/europe/europe_imported.html
+++ b/covid19/blueprints/europe/templates/europe/europe_imported.html
@@ -12,7 +12,7 @@
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
@@ -53,7 +53,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragments/fragment_europe_table_data_imported.html' %}
+ {% include 'europe/fragments/fragment_europe_table_data_imported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_info.html b/covid19/blueprints/europe/templates/europe/europe_info.html
index dae19afa..34445d4a 100644
--- a/covid19/blueprints/europe/templates/europe/europe_info.html
+++ b/covid19/blueprints/europe/templates/europe/europe_info.html
@@ -12,7 +12,7 @@
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
diff --git a/covid19/blueprints/europe/templates/europe/europe_tasks.html b/covid19/blueprints/europe/templates/europe/europe_tasks.html
index 4953e23f..97fc88a4 100644
--- a/covid19/blueprints/europe/templates/europe/europe_tasks.html
+++ b/covid19/blueprints/europe/templates/europe/europe_tasks.html
@@ -11,7 +11,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragments/fragment_europe_navtabs.html' %}
+ {% include 'europe/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
diff --git a/covid19/blueprints/rki/rki_views.py b/covid19/blueprints/rki/rki_views.py
index 0162a0da..3d39f550 100644
--- a/covid19/blueprints/rki/rki_views.py
+++ b/covid19/blueprints/rki/rki_views.py
@@ -17,24 +17,24 @@ app_rki = Blueprint('rki', __name__, template_folder='templates')
# RKI
#
##################################################################################################################
-@app_rki.route('/rki/info')
+@app_rki.route('/info')
def url_rki_info():
page_info = ApplicationPage('RKI', "Info")
return render_template(
- 'templates/rki/rki_info.html',
+ 'rki/rki_info.html',
page_info=page_info)
-@app_rki.route('/rki/tasks')
+@app_rki.route('/tasks')
def url_rki_tasks():
page_info = ApplicationPage('RKI', "Tasks")
return render_template(
- 'templates/rki/rki_tasks.html',
+ 'rki/rki_tasks.html',
page_info=page_info)
-@app_rki.route('/rki/imported/page/<int:page>')
-@app_rki.route('/rki/imported')
+@app_rki.route('/imported/page/<int:page>')
+@app_rki.route('/imported')
def url_rki_imported(page=1):
page_info = ApplicationPage('RKI', "Last Import")
try:
@@ -43,6 +43,6 @@ def url_rki_imported(page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/rki/rki_imported.html',
+ 'rki/rki_imported.html',
page_data=page_data,
page_info=page_info)
diff --git a/covid19/blueprints/rki/templates/rki/rki_imported.html b/covid19/blueprints/rki/templates/rki/rki_imported.html
index 9831348f..2a8897a1 100644
--- a/covid19/blueprints/rki/templates/rki/rki_imported.html
+++ b/covid19/blueprints/rki/templates/rki/rki_imported.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_rki_imported', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('rki.url_rki_imported', 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_rki_imported', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('rki.url_rki_imported', 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_rki_imported', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/rki/templates/rki/rki_tasks.html b/covid19/blueprints/rki/templates/rki/rki_tasks.html
index 14037156..7511aae4 100644
--- a/covid19/blueprints/rki/templates/rki/rki_tasks.html
+++ b/covid19/blueprints/rki/templates/rki/rki_tasks.html
@@ -10,11 +10,11 @@
{% block main_container %}
<div class="btn-group" role="group" aria-label="Views">
- <a class="btn btn-secondary btn-lg" href="/rki_landkreise/region/all" role="button">RKI :: Region :: All</a>
+ <a class="btn btn-secondary btn-lg" href="/rki/region/all" role="button">RKI :: Region :: All</a>
</div>
<div class="btn-group" role="group" aria-label="Views">
- <a class="btn btn-primary btn-lg" href="/rki_landkreise/update/initial" role="button">RKI :: update :: initial</a>
- <a class="btn btn-secondary btn-lg" href="/rki_landkreise/update/short" role="button">RKI :: update :: short</a>
+ <a class="btn btn-primary btn-lg" href="/rki/update/initial" role="button">RKI :: update :: initial</a>
+ <a class="btn btn-secondary btn-lg" href="/rki/update/short" role="button">RKI :: update :: short</a>
</div>
{% endblock %}
diff --git a/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
index 0b0da8a9..fe8e7949 100644
--- a/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
+++ b/covid19/blueprints/vaccination/templates/vaccination/vaccination_timeline_germany.html
@@ -49,7 +49,7 @@
</ul>
{% endif %}
- {% include 'vaccination/fragments/fragments/fragment_vaccination_timeline_germany_table.html' %}
+ {% include 'vaccination/fragments/fragment_vaccination_timeline_germany_table.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_all.html b/covid19/blueprints/who/templates/who/country/who_country_all.html
index dd739966..3849a1d4 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_all.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_all.html
@@ -12,7 +12,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -22,7 +22,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_country_all', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -30,7 +30,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_country_all', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -46,13 +46,13 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_country_all', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %}
+ {% include 'who/fragments/fragment_who_table_who_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_germany.html b/covid19/blueprints/who/templates/who/country/who_country_germany.html
index 76e05b8e..ddb7bc1b 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_germany.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_germany.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_germany', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_germany', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_germany', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one.html b/covid19/blueprints/who/templates/who/country/who_country_one.html
index 92d210e7..ebd1f959 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
index f743b1d7..38a0e74a 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_cumulative', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
index 13880351..36814ce8 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_new', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_cases_new', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
index e0934567..12b462c5 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_cumulative', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
index 78b5b18a..3f966551 100644
--- a/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
+++ b/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -33,7 +33,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -51,7 +51,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -59,7 +59,7 @@
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_country.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index 6c50492f..41b1c1f8 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
@@ -12,7 +12,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -22,7 +22,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_all', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -30,7 +30,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_all', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -46,7 +46,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index 16f25e24..cbd813b7 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index 23250f00..ddafe9c1 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index 51019646..9b24dd54 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_cases_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_cases_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_cases_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index 23250f00..ddafe9c1 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_cumulative',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index f4f8bb52..b6f98b24 100644
--- a/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
@@ -15,7 +15,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -26,7 +26,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
@@ -35,7 +35,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
@@ -52,14 +52,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_date_reported_deaths_new',
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/region/who_region_all.html b/covid19/blueprints/who/templates/who/region/who_region_all.html
index d125b884..16d72667 100644
--- a/covid19/blueprints/who/templates/who/region/who_region_all.html
+++ b/covid19/blueprints/who/templates/who/region/who_region_all.html
@@ -12,7 +12,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -22,7 +22,7 @@
<!-- previous page -->
{% if page_data.has_prev %}
<li>
- <a href="{{ url_for('url_who_region_all', page=page_data.prev_num) }}">Previous</a>
+ <a href="{{ url_for('who.url_who_region_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -30,7 +30,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li>
- <a href="{{ url_for('url_who_region_all', page=page_num) }}">{{ page_num }}</a>
+ <a href="{{ url_for('who.url_who_region_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="active">
@@ -45,7 +45,7 @@
{% endfor %}
<!-- next page -->
{% if page_data.has_next %}
- <li><a href="{{ url_for('url_who_region_all', page=page_data.next_num) }}">Next</a></li>
+ <li><a href="{{ url_for('who.url_who_region_all', page=page_data.next_num) }}">Next</a></li>
{% endif %}
</ul>
{% endif %}
diff --git a/covid19/blueprints/who/templates/who/region/who_region_one.html b/covid19/blueprints/who/templates/who/region/who_region_one.html
index a44d717d..3169d6aa 100644
--- a/covid19/blueprints/who/templates/who/region/who_region_one.html
+++ b/covid19/blueprints/who/templates/who/region/who_region_one.html
@@ -13,7 +13,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/../fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -23,7 +23,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_region', region_id=who_region.id , page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_region', region_id=who_region.id , 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_who_region', region_id=who_region.id ,page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_region', region_id=who_region.id ,page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -47,13 +47,13 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_region', region_id=who_region.id , page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_region', region_id=who_region.id , page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'who/fragments/../fragments/fragment_who_table_who_country.html' %}
+ {% include 'who/fragments/fragment_who_table_who_country.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/who_imported.html b/covid19/blueprints/who/templates/who/who_imported.html
index f75cdbff..1ae75342 100644
--- a/covid19/blueprints/who/templates/who/who_imported.html
+++ b/covid19/blueprints/who/templates/who/who_imported.html
@@ -10,7 +10,7 @@
{% block navigation_navtabs %}
- {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
@@ -21,7 +21,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_imported', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('who.url_who_imported', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -29,7 +29,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_imported', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -45,7 +45,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('url_who_imported', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('who.url_who_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/covid19/blueprints/who/templates/who/who_info.html b/covid19/blueprints/who/templates/who/who_info.html
index 4f1327cb..85470ad8 100644
--- a/covid19/blueprints/who/templates/who/who_info.html
+++ b/covid19/blueprints/who/templates/who/who_info.html
@@ -6,7 +6,7 @@
{% block navigation_navtabs %}
- {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
diff --git a/covid19/blueprints/who/templates/who/who_tasks.html b/covid19/blueprints/who/templates/who/who_tasks.html
index 30be589b..7754283b 100644
--- a/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/covid19/blueprints/who/templates/who/who_tasks.html
@@ -5,7 +5,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'who/fragments/fragments/fragment_who_navtabs.html' %}
+ {% include 'who/fragments/fragment_who_navtabs.html' %}
{% endblock %}
{% block main_container %}
diff --git a/covid19/blueprints/who/who_views.py b/covid19/blueprints/who/who_views.py
index 702d8f16..f02bedc8 100644
--- a/covid19/blueprints/who/who_views.py
+++ b/covid19/blueprints/who/who_views.py
@@ -61,24 +61,24 @@ def task_who_update_initial(self):
return result
-@app_who.route('/who/info')
+@app_who.route('/info')
def url_who_info():
page_info = ApplicationPage('WHO', "Info")
return render_template(
- 'templates/who/who_info.html',
+ 'who/who_info.html',
page_info=page_info)
-@app_who.route('/who/tasks')
+@app_who.route('/tasks')
def url_who_tasks():
page_info = ApplicationPage('WHO', "Tasks")
return render_template(
- 'templates/who/who_tasks.html',
+ 'who/who_tasks.html',
page_info=page_info)
-@app_who.route('/who/imported/page/<int:page>')
-@app_who.route('/who/imported')
+@app_who.route('/imported/page/<int:page>')
+@app_who.route('/imported')
def url_who_imported(page=1):
page_info = ApplicationPage('WHO', "Last Import")
try:
@@ -87,13 +87,13 @@ def url_who_imported(page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/who_imported.html',
+ 'who/who_imported.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/all/page/<int:page>')
-@app_who.route('/who/date_reported/all')
+@app_who.route('/date_reported/all/page/<int:page>')
+@app_who.route('/date_reported/all')
def url_who_date_reported_all(page=1):
page_info = ApplicationPage('WHO', "Date Reported", "All")
try:
@@ -102,13 +102,13 @@ def url_who_date_reported_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_all.html',
+ 'who/date_reported/who_date_reported_all.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>')
+@app_who.route('/date_reported/<int:date_reported_id>/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>')
def url_who_date_reported(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -122,14 +122,14 @@ def url_who_date_reported(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one.html',
+ 'who/date_reported/who_date_reported_one.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_new/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_new')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_new/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_new')
def url_who_date_reported_cases_new(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -143,14 +143,14 @@ def url_who_date_reported_cases_new(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_cases_new.html',
+ 'who/date_reported/who_date_reported_one_cases_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_cumulative/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/cases_cumulative')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_cumulative/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/cases_cumulative')
def url_who_date_reported_cases_cumulative(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -164,14 +164,14 @@ def url_who_date_reported_cases_cumulative(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_cases_cumulative.html',
+ 'who/date_reported/who_date_reported_one_cases_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_new/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_new')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_new/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_new')
def url_who_date_reported_deaths_new(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -185,14 +185,14 @@ def url_who_date_reported_deaths_new(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_deaths_new.html',
+ 'who/date_reported/who_date_reported_one_deaths_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_cumulative/page/<int:page>')
-@app_who.route('/who/date_reported/<int:date_reported_id>/deaths_cumulative')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_cumulative/page/<int:page>')
+@app_who.route('/date_reported/<int:date_reported_id>/deaths_cumulative')
def url_who_date_reported_deaths_cumulative(date_reported_id, page=1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
@@ -206,14 +206,14 @@ def url_who_date_reported_deaths_cumulative(date_reported_id, page=1):
flash("No data in the database.")
page_data = None
return render_template(
- 'templates/who/date_reported/who_date_reported_one_deaths_cumulative.html',
+ 'who/date_reported/who_date_reported_one_deaths_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/region/all/page/<int:page>')
-@app_who.route('/who/region/all')
+@app_who.route('/region/all/page/<int:page>')
+@app_who.route('/region/all')
def url_who_region_all(page=1):
page_info = ApplicationPage('WHO', "Region", "All")
try:
@@ -222,13 +222,13 @@ def url_who_region_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'templates/who/region/who_region_all.html',
+ 'who/region/who_region_all.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/region/<int:region_id>/page/<int:page>')
-@app_who.route('/who/region/<int:region_id>')
+@app_who.route('/region/<int:region_id>/page/<int:page>')
+@app_who.route('/region/<int:region_id>')
def url_who_region(region_id, page=1):
who_region = None
page_info = ApplicationPage("Countries", "WHO Region")
@@ -242,14 +242,14 @@ def url_who_region(region_id, page=1):
flash("No countries of that region in the database.")
page_data = None
return render_template(
- 'templates/who/region/who_region_one.html',
+ 'who/region/who_region_one.html',
who_region=who_region,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/all/page/<int:page>')
-@app_who.route('/who/country/all')
+@app_who.route('/country/all/page/<int:page>')
+@app_who.route('/country/all')
def url_who_country_all(page=1):
page_info = ApplicationPage('WHO', "Countries", "All")
try:
@@ -258,13 +258,13 @@ def url_who_country_all(page=1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'templates/who/country/who_country_all.html',
+ 'who/country/who_country_all.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>')
+@app_who.route('/country/<int:country_id>/page/<int:page>')
+@app_who.route('/country/<int:country_id>')
def url_who_country(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country(who_country, page)
@@ -272,14 +272,14 @@ def url_who_country(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one.html',
+ 'who/country/who_country_one.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/cases_new/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/cases_new')
+@app_who.route('/country/<int:country_id>/cases_new/page/<int:page>')
+@app_who.route('/country/<int:country_id>/cases_new')
def url_who_country_cases_new(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_cases_new(who_country, page)
@@ -287,14 +287,14 @@ def url_who_country_cases_new(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_cases_new.html',
+ 'who/country/who_country_one_cases_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/cases_cumulative/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/cases_cumulative')
+@app_who.route('/country/<int:country_id>/cases_cumulative/page/<int:page>')
+@app_who.route('/country/<int:country_id>/cases_cumulative')
def url_who_country_cases_cumulative(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_cases_cumulative(who_country, page)
@@ -302,14 +302,14 @@ def url_who_country_cases_cumulative(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_cases_cumulative.html',
+ 'who/country/who_country_one_cases_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/deaths_new/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/deaths_new')
+@app_who.route('/country/<int:country_id>/deaths_new/page/<int:page>')
+@app_who.route('/country/<int:country_id>/deaths_new')
def url_who_country_deaths_new(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_deaths_new(who_country, page)
@@ -317,14 +317,14 @@ def url_who_country_deaths_new(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_deaths_new.html',
+ 'who/country/who_country_one_deaths_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/country/<int:country_id>/deaths_cumulative/page/<int:page>')
-@app_who.route('/who/country/<int:country_id>/deaths_cumulative')
+@app_who.route('/country/<int:country_id>/deaths_cumulative/page/<int:page>')
+@app_who.route('/country/<int:country_id>/deaths_cumulative')
def url_who_country_deaths_cumulative(country_id, page=1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoGlobalData.get_data_for_country_order_by_deaths_cumulative(who_country, page)
@@ -332,14 +332,14 @@ def url_who_country_deaths_cumulative(country_id, page=1):
"Country "+who_country.country_code,
"Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
return render_template(
- 'templates/who/country/who_country_one_deaths_cumulative.html',
+ 'who/country/who_country_one_deaths_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/germany/page/<int:page>')
-@app_who.route('/who/germany')
+@app_who.route('/germany/page/<int:page>')
+@app_who.route('/germany')
def url_who_germany(page=1):
page_info = ApplicationPage('WHO', "Germany")
who_country_germany = WhoCountry.get_germany()
@@ -348,13 +348,13 @@ def url_who_germany(page=1):
return redirect(url_for('url_who_tasks'))
page_data = WhoGlobalData.get_data_for_country(who_country_germany, page)
return render_template(
- 'templates/who/country/who_country_germany.html',
+ 'who/country/who_country_germany.html',
who_country=who_country_germany,
page_data=page_data,
page_info=page_info)
-@app_who.route('/who/update')
+@app_who.route('/update')
def url_who_update_run():
app.logger.info("url_who_update_run [start]")
who_service.who_service_download.download_file()
@@ -365,7 +365,7 @@ def url_who_update_run():
return redirect(url_for('url_home'))
-@app_who.route('/who/update/short')
+@app_who.route('/update/short')
def url_who_update_short_run():
who_service.who_service_download.download_file()
task_who_update_short.apply_async()
@@ -374,7 +374,7 @@ def url_who_update_short_run():
return redirect(url_for('url_home'))
-@app_who.route('/who/update/initial')
+@app_who.route('/update/initial')
def url_who_update_initial_run():
who_service.who_service_download.download_file()
task_who_update_initial.apply_async()
--
GitLab