From 115e962b91c42b146b85a9533ec996639d71978f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 13 Feb 2021 16:58:33 +0100
Subject: [PATCH] ## 0.0.15 Release * ------------------------------------- *
Fixed #88 rename VaccinationImport to VaccinationImport * Fixed #89 change
tablename from vaccination_germany_timeline_import to vaccination_import *
Fixed #86 rename VaccinationData to VaccinationData * Fixed #162 rename table
vaccination_germany_timeline into vaccination_data *
------------------------------------- * Fixed #170 implement
url_vaccination_task_update_star_schema_initial in vaccination_views.py *
Fixed #171 implement url_vaccination_task_update_starschema_incremental in
vaccination_views.py * Fixed #172 implement url_vaccination_task_import_only
in vaccination_views.py * Fixed #173 implement
url_vaccination_task_import_only in vaccination_views.py * Fixed #174
implement url_vaccination_task_update_dimensiontables_only in
vaccination_views.py * Fixed #175 implement
url_vaccination_task_update_facttable_incremental_only in
vaccination_views.py * Fixed #176 implement
url_vaccination_task_update_facttable_initial_only in vaccination_views.py *
------------------------------------- * Fixed #91 implement
VaccinationService.run_download_only * Fixed #92 implement
VaccinationService.run_import_only * Fixed #93 implement
VaccinationService.run_update_dimension_tables_only * Fixed #94 implement
VaccinationService.run_update_fact_table_incremental_only * Fixed #95
implement VaccinationService.run_update_fact_table_initial_only * Fixed #96
implement VaccinationService.run_update_star_schema_incremental * Fixed #97
implement VaccinationService.run_update_star_schema_initial * Fixed #101
implement VaccinationServiceUpdate.update_dimension_tables_only * Fixed #102
implement VaccinationServiceUpdate.update_fact_table_incremental_only * Fixed
#103 implement VaccinationServiceUpdate.update_fact_table_initial_only *
Fixed #104 implement VaccinationServiceUpdate.update_star_schema_incremental
* Fixed #105 implement VaccinationServiceUpdate.update_star_schema_initial *
------------------------------------- * Fixed #90 refactor VaccinationService
to new method scheme introduced 07.02.2021 * Fixed #98 refactor
VaccinationServiceDownload to new method scheme introduced 07.02.2021 * Fixed
#99 refactor VaccinationServiceImport to new method scheme introduced
07.02.2021 * Fixed #100 refactor VaccinationServiceUpdate to new method
scheme introduced 07.02.2021 * ------------------------------------- * Fixed
#87 change to: Vaccination.datum many to one VaccinationDateReported * Fixed
#106 add Tasks and URLs for starting Tasks to vaccination_views *
-------------------------------------
---
.../ecdc/templates/ecdc/ecdc_data.html | 12 ++--
.../ecdc/templates/ecdc/ecdc_imported.html | 12 ++--
.../ecdc/templates/ecdc/ecdc_info.html | 2 +-
.../ecdc/templates/ecdc/ecdc_tasks.html | 2 +-
.../rki_bundeslaender_imported.html | 4 +-
.../rki_bundeslaender_info.html | 2 +-
.../rki_bundeslaender_tasks.html | 2 +-
.../rki_vaccination/rki_vaccination_views.py | 26 ++++----
...gment_rki_vaccination_navbar_dropdown.html | 65 ++++++++++++++++---
.../fragment_rki_vaccination_navtabs.html | 8 +--
.../rki_vaccination/rki_vaccination_data.html | 4 +-
.../rki_vaccination_import.html | 22 +++++--
.../rki_vaccination/rki_vaccination_info.html | 2 +-
.../rki_vaccination_tasks.html | 16 ++---
.../who/country/who_country_all.html | 2 +-
.../who/country/who_country_germany.html | 2 +-
.../who/country/who_country_one.html | 2 +-
.../who_country_one_cases_cumulative.html | 2 +-
.../country/who_country_one_cases_new.html | 2 +-
.../who_country_one_deaths_cumulative.html | 2 +-
.../country/who_country_one_deaths_new.html | 2 +-
.../date_reported/who_date_reported_all.html | 2 +-
.../date_reported/who_date_reported_one.html | 4 +-
...ho_date_reported_one_cases_cumulative.html | 4 +-
.../who_date_reported_one_cases_new.html | 8 ++-
...o_date_reported_one_deaths_cumulative.html | 4 +-
.../who_date_reported_one_deaths_new.html | 16 +++--
.../fragment_who_navbar_dropdown.html | 43 ++++++++----
.../who/fragments/fragment_who_navtabs.html | 15 ++---
.../fragment_who_table_global_data.html | 9 ++-
.../templates/who/region/who_region_all.html | 2 +-
.../templates/who/region/who_region_one.html | 11 ++--
.../who/templates/who/who_imported.html | 13 ++--
.../who/templates/who/who_info.html | 2 +-
.../who/templates/who/who_tasks.html | 16 ++---
35 files changed, 216 insertions(+), 126 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
index bde3d73c..6dc68753 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
@@ -12,7 +12,7 @@
{% endblock %}
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+ {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
{% block main_container_fluid %}
@@ -22,7 +22,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'europe.url_europe_data', page=page_data.prev_num) }}">
+ href="{{ url_for( 'ecdc.url_europe_data', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -32,7 +32,7 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'europe.url_europe_data', page=page_num) }}">
+ href="{{ url_for( 'ecdc.url_europe_data', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -50,7 +50,7 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'europe.url_europe_data', page=page_data.next_num) }}">
+ href="{{ url_for( 'ecdc.url_europe_data', page=page_data.next_num) }}">
Next
</a>
</li>
@@ -58,7 +58,7 @@
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data.html' %}
+ {% include 'ecdc/fragments/fragment_europe_table_data.html' %}
{% endblock %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
index 9b1760f0..cb4154bf 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
@@ -13,7 +13,7 @@
{% block navigation_navtabs %}
- {% include 'europe/fragments/fragment_europe_navtabs.html' %}
+ {% include 'ecdc/fragments/fragment_europe_navtabs.html' %}
{% endblock %}
@@ -24,7 +24,7 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('europe.url_europe_data_imported', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link" href="{{ url_for('ecdc.url_europe_data_imported', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -32,7 +32,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('europe.url_europe_data_imported', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('ecdc.url_europe_data_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -48,13 +48,13 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('europe.url_europe_data_imported', page=page_data.next_num) }}">Next</a>
+ <a class="page-link" href="{{ url_for('ecdc.url_europe_data_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'europe/fragments/fragment_europe_table_data_imported.html' %}
+ {% include 'ecdc/fragments/fragment_europe_table_data_imported.html' %}
{% endblock %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
index 6fdc4243..b6972a70 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
index e9c3a216..70916072 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html
index 71fd07ea..63455306 100644
--- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html
+++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
index ac255399..9a61862f 100644
--- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
+++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
index f26cea8d..5d96de3d 100644
--- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
+++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py
index cff2a691..d0851a1f 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py
@@ -116,7 +116,7 @@ def task_vaccination_task_update_starschema_initial(self):
def url_vaccination_info():
page_info = ApplicationPage('Vaccination', "Info")
return render_template(
- 'rki_vaccination/vaccination_info.html',
+ 'rki_vaccination/rki_vaccination_info.html',
page_info=page_info)
@@ -124,7 +124,7 @@ def url_vaccination_info():
def url_vaccination_tasks():
page_info = ApplicationPage('Vaccination', "Tasks")
return render_template(
- 'rki_vaccination/vaccination_tasks.html',
+ 'rki_vaccination/rki_vaccination_tasks.html',
page_info=page_info)
@@ -134,7 +134,7 @@ def url_vaccination_imported(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline imported")
page_data = RkiVaccinationImport.get_all_as_page(page)
return render_template(
- 'rki_vaccination/vaccination_imported.html',
+ 'rki_vaccination/rki_vaccination_imported.html',
page_data=page_data,
page_info=page_info)
@@ -145,7 +145,7 @@ def url_vaccination_data(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline")
page_data = RkiVaccinationData.get_all_as_page(page)
return render_template(
- 'rki_vaccination/vaccination_data.html',
+ 'rki_vaccination/rki_vaccination_data.html',
page_data=page_data,
page_info=page_info)
@@ -156,7 +156,7 @@ def url_vaccination_datereported_all(page=1):
page_info = ApplicationPage('Vaccination', "Germany Timeline")
page_data = RkiVaccinationDateReported.get_all_as_page(page)
return render_template(
- 'rki_vaccination/vaccination_timeline_germany.html',
+ 'rki_vaccination/rki_vaccination_timeline_germany.html',
page_data=page_data,
page_info=page_info)
@@ -168,7 +168,7 @@ def url_vaccination_datereported_one(page=1, vaccination_date_reported_id=0):
datereported = RkiVaccinationDateReported.find_by_id(vaccination_date_reported_id)
page_data = RkiVaccinationData.find_by_datum(page, datereported)
return render_template(
- 'rki_vaccination/vaccination_timeline_germany.html',
+ 'rki_vaccination/rki_vaccination_timeline_germany.html',
datereported=datereported,
page_data=page_data,
page_info=page_info)
@@ -178,35 +178,35 @@ def url_vaccination_datereported_one(page=1, vaccination_date_reported_id=0):
def url_vaccination_task_download_only():
flash("url_vaccination_task_download_only started")
rki_vaccination_service.run_download_only()
- return redirect(url_for('vaccination.url_vaccination_tasks'))
+ return redirect(url_for('rki_vaccination.url_vaccination_tasks'))
@app_rki_vaccination.route('/task/import/only')
def url_vaccination_task_import_only():
flash("url_vaccination_task_import_only started")
task_vaccination_import_only.apply_async()
- return redirect(url_for('vaccination.url_vaccination_tasks'))
+ return redirect(url_for('rki_vaccination.url_vaccination_tasks'))
@app_rki_vaccination.route('/task/update/dimension-tables/only')
def url_vaccination_task_update_dimensiontables_only():
flash("url_vaccination_task_update_dimensiontables_only started")
task_vaccination_update_dimension_tables_only.apply_async()
- return redirect(url_for('vaccination.url_vaccination_tasks'))
+ return redirect(url_for('rki_vaccination.url_vaccination_tasks'))
@app_rki_vaccination.route('/task/update/fact-table/incremental/only')
def url_vaccination_task_update_facttable_incremental_only():
flash("url_vaccination_task_update_facttable_incremental_only started")
task_vaccination_update_facttable_incremental_only.apply_async()
- return redirect(url_for('vaccination.url_vaccination_tasks'))
+ return redirect(url_for('rki_vaccination.url_vaccination_tasks'))
@app_rki_vaccination.route('/task/update/fact-table/initial/only')
def url_vaccination_task_update_facttable_initial_only():
flash("url_vaccination_task_update_facttable_initial_only started")
task_vaccination_update_facttable_initial_only.apply_async()
- return redirect(url_for('vaccination.url_vaccination_tasks'))
+ return redirect(url_for('rki_vaccination.url_vaccination_tasks'))
@app_rki_vaccination.route('/task/update/star_schema/initial')
@@ -214,7 +214,7 @@ def url_vaccination_task_update_starschema_initial():
flash("url_vaccination_task_update_star_schemainitial started")
rki_vaccination_service.run_download_only()
task_vaccination_task_update_starschema_initial.apply_async()
- return redirect(url_for('vaccination.url_vaccination_tasks'))
+ return redirect(url_for('rki_vaccination.url_vaccination_tasks'))
@app_rki_vaccination.route('/task/update/star_schema/incremental')
@@ -222,4 +222,4 @@ def url_vaccination_task_update_starschema_incremental():
flash("url_vaccination_task_update_starschema_incremental started")
rki_vaccination_service.run_download_only()
task_vaccination_update_starschema_incremental.apply_async()
- return redirect(url_for('vaccination.url_vaccination_tasks'))
+ return redirect(url_for('rki_vaccination.url_vaccination_tasks'))
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html
index 763da302..3522d255 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html
@@ -4,16 +4,65 @@
Vaccination
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <!-- TODO: change URL to for_url() -->
- <a class="dropdown-item" href="/vaccination/timeline/germany">Vaccination</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}">
+ Vaccination
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/vaccination/tasks">Vaccination tasks</a>
- <a class="dropdown-item" href="/vaccination/info">Vaccination Info</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_tasks') }}">
+ Vaccination tasks
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}">
+ Vaccination Info
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/vaccination/update/initial">Task: Vaccination :: update :: initial</a>
- <a class="dropdown-item" href="/vaccination/update/short">Task: Vaccination :: update :: short</a>
- <!-- Tasks -->
+
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_datereported_all') }}">
+ Vaccination :: url_vaccination_datereported_all
+ </a>
+ <div class="dropdown-divider"></div>
+
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_download_only') }}">
+ Vaccination :: TASK:: url_vaccination_task_download_only
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_import_only') }}">
+ Vaccination :: TASK:: url_vaccination_task_download_only
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_dimensiontables_only') }}">
+ Vaccination :: TASK:: url_vaccination_task_update_dimensiontables_only
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_incremental_only') }}">
+ Vaccination :: TASK:: url_vaccination_task_update_facttable_incremental_only
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_initial_only') }}">
+ Vaccination :: TASK:: url_vaccination_task_update_facttable_initial_only
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/vaccination/timeline/germany">Vaccination Timeline Germany</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_initial') }}">
+ Vaccination :: TASK:: url_vaccination_task_update_starschema_initial
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_incremental') }}">
+ Vaccination :: TASK:: url_vaccination_task_update_starschema_incremental
+ </a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_data') }}">
+ Vaccination Timeline Germany Data
+ </a>
+ <!-- Tasks -->
+ <a class="dropdown-item"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_imported') }}">
+ Vaccination Timeline Germany imported
+ </a>
</div>
</li>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
index 87836a8b..80c7f3ef 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
@@ -3,25 +3,25 @@
<!-- TODO: change URL to for_url() -->
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'vaccination.url_vaccination_info') }}">
+ href="{{ url_for( 'rki_vaccination.url_vaccination_info') }}">
Vaccination Info
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'vaccination.url_vaccination_tasks') }}">
+ href="{{ url_for( 'rki_vaccination.url_vaccination_tasks') }}">
Vaccination tasks
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'vaccination.url_vaccination_imported') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_imported') }}">
Vaccination :: imported
</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'vaccination.url_vaccination_data') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_data') }}">
Vaccination :: Data
</a>
</li>
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
index 562878c2..657b4853 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
index 562878c2..c6d2a5df 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
@@ -8,7 +8,7 @@
{% block navigation_navtabs %}
- {% include 'vaccination/fragments/fragment_vaccination_navtabs.html' %}
+ {% include 'rki_vaccination/fragments/fragment_vaccination_navtabs.html' %}
{% endblock %}
@@ -19,7 +19,10 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('vaccination.url_vaccination_timeline_germany', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link"
+ href="{{ url_for('rki_vaccination.url_vaccination_timeline_germany', page=page_data.prev_num) }}">
+ Previous
+ </a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -27,7 +30,9 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('vaccination.url_vaccination_timeline_germany', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('rki_vaccination.url_vaccination_timeline_germany', page=page_num) }}">
+ {{ page_num }}
+ </a>
</li>
{% else %}
<li class="page-item active">
@@ -43,13 +48,16 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('vaccination.url_vaccination_timeline_germany', page=page_data.next_num) }}">Next</a>
+ <a class="page-link"
+ href="{{ url_for('rki_vaccination.url_vaccination_timeline_germany', page=page_data.next_num) }}">
+ Next
+ </a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'vaccination/fragments/fragment_vaccination_timeline_germany_table.html' %}
+ {% include 'rki_vaccination/fragments/fragment_vaccination_timeline_germany_table.html' %}
{% endblock %}
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
index 35e74778..b22fe021 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
index adfcec5f..189370b0 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
@@ -18,33 +18,33 @@
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'vaccination.url_vaccination_task_update_starschema_initial') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_initial') }}"
role="button">Vaccination :: Task :: update :: star_schema :: initial</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'vaccination.url_vaccination_task_update_starschema_incremental') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_starschema_incremental') }}"
role="button">Vaccination :: Task :: update :: star_schema :: incremental</a>
</div>
</div>
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'vaccination.url_vaccination_task_download_only') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_download_only') }}"
role="button">Vaccination :: Task :: download :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'vaccination.url_vaccination_task_import_only') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_import_only') }}"
role="button">Vaccination :: Task :: import :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'vaccination.url_vaccination_task_update_dimensiontables_only') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_dimensiontables_only') }}"
role="button">Vaccination :: Task :: update :: dimension-tables : only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'vaccination.url_vaccination_task_update_facttable_incremental_only') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_incremental_only') }}"
role="button">Vaccination :: Task :: update :: fact-table :: only :: incremental</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'vaccination.url_vaccination_task_update_facttable_initial_only') }}"
+ href="{{ url_for( 'rki_vaccination.url_vaccination_task_update_facttable_initial_only') }}"
role="button">Vaccination :: Task :: update :: fact-table :: only :: initial</a>
</div>
</div>
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_all.html b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
index c60456d6..640fb689 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_all.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
index 5cc8c5ec..8545e436 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one.html b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
index ee8058dd..31f7c4a3 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
index dbe7156f..ded2572d 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
index bf49f754..05e6d030 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
index 6283d8ac..819cecdf 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
index 7ef4f745..ec22097e 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index 0989b2c5..fd58835e 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index 207ef195..17d942f0 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index cf2a69ee..03f5fd2a 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index 86a57194..851847f5 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_jumbotron %}{% endblock %}
@@ -28,7 +28,9 @@
{% if page_data.has_prev %}
<li class="page-item">
<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>
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">
+ Previous
+ </a>
</li>
{% endif %}
<!-- all page numbers -->
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index cf2a69ee..03f5fd2a 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index 51794ed7..6adaa45d 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_jumbotron %}{% endblock %}
@@ -37,11 +37,15 @@
{% if page_num != page_data.page %}
<li class="page-item">
<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>
+ date_reported_id=who_date_reported.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
</li>
{% else %}
<li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ <a class="page-link" href="#">
+ {{ page_num }}
+ </a>
</li>
{% endif %}
{% else %}
@@ -54,7 +58,9 @@
{% if page_data.has_next %}
<li class="page-item">
<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>
+ date_reported_id=who_date_reported.id, page=page_data.next_num) }}">
+ Next
+ </a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html
index dcf72725..3f148443 100644
--- a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html
+++ b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html
@@ -5,20 +5,41 @@
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<!-- TODO: change URL to for_url() -->
- <a class="dropdown-item" href="/who/date_reported/all">WHO</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ WHO
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/who/germany">WHO Germany</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_germany') }}">
+ WHO Germany
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/who/region/all">WHO Regions</a>
- <a class="dropdown-item" href="/who/date_reported/all">WHO Date Reported</a>
- <a class="dropdown-item" href="/who/country/all">WHO Countries</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_region_all') }}">
+ WHO Regions
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ WHO Date Reported
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_country_all') }}">
+ WHO Countries
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/who/update">WHO Task: Update Data</a>
- <a class="dropdown-item" href="/who/update/short">WHO Task: Update Data Short</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_imported') }}">
+ WHO imported
+ </a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/who/imported">WHO imported</a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/who/info">WHO Info</a>
- <a class="dropdown-item" href="/who/tasks">WHO Tasks</a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_info') }}">
+ WHO Info
+ </a>
+ <a class="dropdown-item"
+ href="{{ url_for( 'who.url_who_tasks') }}">
+ WHO Tasks
+ </a>
</div>
</li>
\ No newline at end of file
diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
index ed73deb8..67de355e 100644
--- a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
+++ b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
@@ -1,34 +1,33 @@
<br/>
<nav>
<ul class="nav nav-tabs">
- <!-- TODO: change URL to for_url() -->
<li class="nav-item">
<a class="nav-link"
- href="/who/info">WHO Info</a>
+ href="{{ url_for( 'who.url_who_info') }}">WHO Info</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/who/tasks">WHO tasks</a>
+ href="{{ url_for( 'who.url_who_tasks') }}">WHO tasks</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/who/date_reported/all">WHO Date Reported</a>
+ href="{{ url_for( 'who.url_who_date_reported_all') }}">WHO Date Reported</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/who/germany">WHO Germany</a>
+ href="{{ url_for( 'who.url_who_germany') }}">WHO Germany</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/who/region/all">WHO Regions</a>
+ href="{{ url_for( 'who.url_who_region_all') }}">WHO Regions</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/who/country/all">WHO Countries</a>
+ href="{{ url_for( 'who.url_who_country_all') }}">WHO Countries</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="/who/imported">WHO imported</a>
+ href="{{ url_for( 'who.url_who_imported') }}">WHO imported</a>
</li>
</ul>
</nav>
\ No newline at end of file
diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html
index 46f903b9..90049ac2 100644
--- a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html
+++ b/src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data.html
@@ -1,9 +1,8 @@
<table class="table table-hover table-striped table-dark">
<thead class="table-secondary">
<tr>
- <!-- TODO: change URL to for_url() -->
<th scope="col">
- <a href="/who/date_reported/all">
+ <a href="{{ url_for( 'who.url_who_date_reported_all') }}">
date reported
</a>
</th>
@@ -20,17 +19,17 @@
cases cumulative
</th>
<th scope="col">
- <a href="/who/country/all">
+ <a href="{{ url_for( 'who.url_who_country_all') }}">
country code
</a>
</th>
<th scope="col">
- <a href="/who/country/all">
+ <a href="{{ url_for( 'who.url_who_country_all') }}">
country
</a>
</th>
<th scope="col">
- <a href="/who/region/all">
+ <a href="{{ url_for( 'who.url_who_region_all') }}">
region
</a>
</th>
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_all.html b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
index dd9e8331..d39ad83b 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_all.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_one.html b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
index 2ef5651f..0014aa6c 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_one.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_jumbotron %}{% endblock %}
@@ -24,7 +24,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.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 -->
@@ -32,7 +33,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.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">
@@ -48,7 +50,8 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.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>
diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/covid19/blueprints/who/templates/who/who_imported.html
index 50aba864..1da77b87 100644
--- a/src/covid19/blueprints/who/templates/who/who_imported.html
+++ b/src/covid19/blueprints/who/templates/who/who_imported.html
@@ -1,6 +1,6 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
-{% include 'common/fragment_pagination.html' %}
+{% include 'application/fragment_pagination.html' %}
{% block navigation_jumbotron %}{% endblock %}
@@ -22,7 +22,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.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 -->
@@ -30,7 +31,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.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">
@@ -46,7 +48,8 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.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/src/covid19/blueprints/who/templates/who/who_info.html b/src/covid19/blueprints/who/templates/who/who_info.html
index bd61bc3f..babbccdb 100644
--- a/src/covid19/blueprints/who/templates/who/who_info.html
+++ b/src/covid19/blueprints/who/templates/who/who_info.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index b2e1e642..073506a0 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'common/page_layout.html' %}
+{% extends 'application/page_layout.html' %}
{% block navigation_breadcrumb %}
<!-- TODO: implement navigation_breadcrumb in .html -->
@@ -13,29 +13,29 @@
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-primary btn-lg btn-block text-left"
- href="/who/task/update/star_schema/initial"
+ href="{{ url_for( 'who.url_task_who_update_star_schema_initial') }}"
role="button">WHO :: Task :: update :: star_schema :: initial</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="/who/task/update/star_schema/incremental"
+ href="{{ url_for( 'who.url_task_who_update_star_schema_incremental') }}"
role="button">WHO :: Task :: update :: star_schema :: incremental</a>
</div>
</div>
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/who/task/download/only"
+ href="{{ url_for( 'who.url_task_who_download_only') }}"
role="button">WHO :: Task :: download :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/who/task/import/only"
+ href="{{ url_for( 'who.url_task_who_import_only') }}"
role="button">WHO :: Task :: import :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/who/task/update/dimension-tables/only"
+ href="{{ url_for( 'who.url_task_who_update_dimension_tables_only') }}"
role="button">WHO :: Task :: update :: dimension-tables : only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/who/task/update/fact-table/incremental/only"
+ href="{{ url_for( 'who.url_task_who_update_fact_table_incremental_only') }}"
role="button">WHO :: Task :: update :: fact-table :: only :: incremental</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/who/task/update/fact-table/initial/only"
+ href="{{ url_for( 'who.url_task_who_update_fact_table_initial_only') }}"
role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
</div>
</div>
--
GitLab