From 5010af8ab8f99993f33237dc90554a6cad4516c6 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 13:09:09 +0100
Subject: [PATCH] ### 0.0.17 Release * Fixed #123 split RkiBundeslaenderService
into two Services, one for bundeslaender and one for landkreise * Fixed #128
add fields from csv to RkiLandkreiseImport * Fixed #139 refactor
RkiBundeslaenderServiceDownload to new method scheme introduced 07.02.2021 *
Fixed #140 move WhoImport to RKI in: rk_service_import.py * Fixed #125
implement RkiLandkreise * Fixed #126 implement RkiBundeslaenderImport
### 0.0.18 Release
* Fixed #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Fixed #40 SQLalchemy instead of SQL: EcdcImport.get_date_rep()
* Fixed #41 SQLalchemy instead of SQL: EcdcImport.get_countries_of_continent()
* Fixed #107 SQLalchemy instead of SQL in: EcdcImport.get_countries_of_continent
* Fixed #109 SQLalchemy instead of SQL in: EcdcImport.get_date_rep
* Fixed #110 SQLalchemy instead of SQL in: EcdcImport.get_continent
---
.../who/country/who_country_all.html | 73 +++++----
.../who/country/who_country_germany.html | 82 +++++-----
.../who/country/who_country_one.html | 82 +++++-----
.../who_country_one_cases_cumulative.html | 82 +++++-----
.../country/who_country_one_cases_new.html | 81 +++++-----
.../who_country_one_deaths_cumulative.html | 81 +++++-----
.../country/who_country_one_deaths_new.html | 81 +++++-----
.../date_reported/who_date_reported_all.html | 148 +++++++++---------
.../date_reported/who_date_reported_one.html | 77 +++++----
...ho_date_reported_one_cases_cumulative.html | 77 ++++-----
.../who_date_reported_one_cases_new.html | 81 +++++-----
...o_date_reported_one_deaths_cumulative.html | 78 ++++-----
.../who_date_reported_one_deaths_new.html | 88 ++++++-----
.../templates/who/region/who_region_all.html | 120 +++++++-------
.../templates/who/region/who_region_one.html | 79 +++++-----
.../who/templates/who/who_imported.html | 131 ++++++++--------
.../who/templates/who/who_info.html | 30 ++--
.../who/templates/who/who_tasks.html | 58 +++----
18 files changed, 834 insertions(+), 695 deletions(-)
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 3e19139d..f04c6713 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
@@ -4,42 +4,51 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.prev_num) }}">Previous</a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <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">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_country_all', page=page_data.next_num) }}">Next</a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <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/fragment_who_table_who_country.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_who_country.html' %}
+ </div>
+ </div>
+ </div>
{% 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 66abb9ce..5b1126fc 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
@@ -4,49 +4,57 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_num) }}">
- {{ page_num }}
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.prev_num) }}">
+ Previous
</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.next_num) }}">
+ Next
+ </a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_germany', country_id=who_country.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ </div>
{% 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 bed68d14..1334cd23 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
@@ -4,49 +4,57 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_num) }}">
- {{ page_num }}
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.prev_num) }}">
+ Previous
</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.next_num) }}">
+ Next
+ </a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country', country_id=who_country.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ </div>
{% 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 011d4779..16c5f4b4 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
@@ -4,49 +4,57 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_num) }}">
- {{ page_num }}
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ Previous
</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ Next
+ </a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ </div>
{% 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 0f04f8de..3e3fe794 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
@@ -4,48 +4,57 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_num) }}">
- {{ page_num }}
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ Previous
</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.next_num) }}">
+ Next
+ </a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_cases_new', country_id=who_country.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ </div>
{% 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 d0defd5b..528bf267 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
@@ -4,48 +4,57 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_num) }}">
- {{ page_num }}
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.prev_num) }}">
+ Previous
</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
+ Next
+ </a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_cumulative', country_id=who_country.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ </div>
{% 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 54c288ee..b1a91f66 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
@@ -4,47 +4,56 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
- {{ page_num }}
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.prev_num) }}">
+ Previous
</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link"
+ href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
+ Next
+ </a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link"
- href="{{ url_for( 'who.url_who_country_deaths_new', country_id=who_country.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_country.html' %}
+ </div>
+ </div>
+ </div>
{% 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 cd8ee5fe..bb56aeb5 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
@@ -4,80 +4,88 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <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 -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('who.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_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <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">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- <table class="table table-hover table-striped table-dark">
- <thead class="table-secondary">
- <tr>
- <th scope="col" class="text-right">day of week</th>
- <th scope="col" class="text-left">date reported</th>
- <th scope="col" class="text-right">week of year</th>
- <th scope="col" class="text-left">year</th>
- </tr>
- </thead>
- <tbody>
- {% for who_date_reported in page_data.items %}
- <tr>
- <td class="text-right">
- {{ who_date_reported.get_name_for_weekday() }}
- </td>
- <td class="text-left">
- <a href="/who/date_reported/{{ who_date_reported.id }}">
- {{ who_date_reported }}
- </a>
- </td>
- <td class="text-right">
- {{ who_date_reported.week_of_year }}
- </td>
- <td class="text-left">
- {{ who_date_reported.year }}
- </td>
- </tr>
- {% endfor %}
- </tbody>
- <tfoot class="table-secondary">
- <tr>
- <th scope="col" class="text-right">day of week</th>
- <th scope="col" class="text-left">date reported</th>
- <th scope="col" class="text-right">week of year</th>
- <th scope="col" class="text-left">year</th>
- </tr>
- </tfoot>
- </table>
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ <table class="table table-hover table-striped table-dark">
+ <thead class="table-secondary">
+ <tr>
+ <th scope="col" class="text-right">day of week</th>
+ <th scope="col" class="text-left">date reported</th>
+ <th scope="col" class="text-right">week of year</th>
+ <th scope="col" class="text-left">year</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for who_date_reported in page_data.items %}
+ <tr>
+ <td class="text-right">
+ {{ who_date_reported.get_name_for_weekday() }}
+ </td>
+ <td class="text-left">
+ <a href="/who/date_reported/{{ who_date_reported.id }}">
+ {{ who_date_reported }}
+ </a>
+ </td>
+ <td class="text-right">
+ {{ who_date_reported.week_of_year }}
+ </td>
+ <td class="text-left">
+ {{ who_date_reported.year }}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ <tfoot class="table-secondary">
+ <tr>
+ <th scope="col" class="text-right">day of week</th>
+ <th scope="col" class="text-left">date reported</th>
+ <th scope="col" class="text-right">week of year</th>
+ <th scope="col" class="text-left">year</th>
+ </tr>
+ </tfoot>
+ </table>
+ </div>
+ </div>
+ </div>
{% endblock %}
{% block footer_container %}
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 c7fadde5..ea42e88b 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
@@ -4,45 +4,54 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <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 %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<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>
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <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 %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <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 %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <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/fragment_who_table_global_data_date_reported.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ </div>
+ </div>
+ </div>
{% 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 f54979a9..0297141e 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
@@ -4,46 +4,53 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <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 %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<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>
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <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 %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <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 %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <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/fragment_who_table_global_data_date_reported.html' %}
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ </div>
+ </div>
{% endblock %}
{% block footer_container %}
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 b8090d8b..aa43b732 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
@@ -4,47 +4,56 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% 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>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% 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_num) }}">{{ page_num }}</a>
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">
+ Previous
+ </a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <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_num) }}">{{ page_num }}</a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <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.next_num) }}">Next</a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <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.next_num) }}">Next</a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ </div>
+ </div>
+ </div>
{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index f54979a9..31b7bb3f 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
@@ -4,46 +4,54 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <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 %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<li class="page-item">
<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>
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <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 %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <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 %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <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/fragment_who_table_global_data_date_reported.html' %}
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ </div>
+ </div>
+ </div>
{% endblock %}
{% block footer_container %}
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 7bc7f6e5..fad9a361 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
@@ -4,52 +4,60 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <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.prev_num) }}">Previous</a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
<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_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">
- {{ page_num }}
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% 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>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">
+ {{ page_num }}
+ </a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% 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>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% 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>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ </div>
+ </div>
+ </div>
{% endblock %}
{% block footer_container %}
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 dcf52ab3..b84c7e32 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
@@ -4,67 +4,75 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- <!-- previous page -->
- {% if page_data.has_prev %}
- <li>
- <a href="{{ url_for('who.url_who_region_all', page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ <!-- previous page -->
+ {% if page_data.has_prev %}
<li>
- <a href="{{ url_for('who.url_who_region_all', page=page_num) }}">
- {{ page_num }}
+ <a href="{{ url_for('who.url_who_region_all', page=page_data.prev_num) }}">
+ Previous
</a>
</li>
- {% else %}
- <li class="active">
- <a href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li>
+ <a href="{{ url_for('who.url_who_region_all', page=page_num) }}">
+ {{ page_num }}
+ </a>
+ </li>
+ {% else %}
+ <li class="active">
+ <a href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li>
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li>
+ <a href="{{ url_for('who.url_who_region_all', page=page_data.next_num) }}">
+ Next
+ </a>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li>
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li>
- <a href="{{ url_for('who.url_who_region_all', page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- <table class="table table-hover table-striped table-dark">
- <thead>
- <tr>
- <th scope="col">who_region</th>
- </tr>
- </thead>
- <tbody>
- {% for who_region in page_data.items %}
- <tr>
- <td>
- <a href="/who/region/{{ who_region.id }}">
- {{ who_region.region }}
- </a>
- </td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ <table class="table table-hover table-striped table-dark">
+ <thead>
+ <tr>
+ <th scope="col">who_region</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for who_region in page_data.items %}
+ <tr>
+ <td>
+ <a href="/who/region/{{ who_region.id }}">
+ {{ who_region.region }}
+ </a>
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
{% endblock %}
{% block footer_container %}
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 58b08f9c..c2e6a340 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
@@ -4,46 +4,55 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <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>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <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_num) }}">{{ page_num }}</a>
+ region_id=who_region.id , page=page_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% 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>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- 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>
</li>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- 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>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- {% include 'who/fragments/fragment_who_table_who_country.html' %}
-
+ </ul>
+ {% endif %}
+ </div>
+ </div>
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% include 'who/fragments/fragment_who_table_who_country.html' %}
+ </div>
+ </div>
+ </div>
{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/covid19/blueprints/who/templates/who/who_imported.html
index fa69facd..1dad80b5 100644
--- a/src/covid19/blueprints/who/templates/who/who_imported.html
+++ b/src/covid19/blueprints/who/templates/who/who_imported.html
@@ -4,72 +4,81 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <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>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <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_num) }}">{{ page_num }}</a>
+ href="{{ url_for('who.url_who_imported', page=page_data.prev_num) }}">Previous</a>
</li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% 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>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- 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>
</li>
+ {% endif %}
+ </ul>
{% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- 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>
- </li>
- {% endif %}
- </ul>
- {% endif %}
-
- <table class="table table-hover table-striped table-dark">
- <thead>
- <tr>
- <th scope="col">date reported</th>
- <th scope="col">country</th>
- <th scope="col">country code</th>
- <th scope="col">who region</th>
- <th scope="col">new cases</th>
- <th scope="col">cumulative cases</th>
- <th scope="col">new deaths</th>
- <th scope="col">cumulative deaths</th>
- </tr>
- </thead>
- <tbody>
- {% for who_global_data_import in page_data.items %}
- <tr>
- <td>{{ who_global_data_import.date_reported }}</td>
- <td>{{ who_global_data_import.country }}</td>
- <td>{{ who_global_data_import.country_code }}</td>
- <td>{{ who_global_data_import.who_region }}</td>
- <td>{{ who_global_data_import.new_cases }}</td>
- <td>{{ who_global_data_import.cumulative_cases }}</td>
- <td>{{ who_global_data_import.new_deaths }}</td>
- <td>{{ who_global_data_import.cumulative_deaths }}</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ <table class="table table-hover table-striped table-dark">
+ <thead>
+ <tr>
+ <th scope="col">date reported</th>
+ <th scope="col">country</th>
+ <th scope="col">country code</th>
+ <th scope="col">who region</th>
+ <th scope="col">new cases</th>
+ <th scope="col">cumulative cases</th>
+ <th scope="col">new deaths</th>
+ <th scope="col">cumulative deaths</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for who_global_data_import in page_data.items %}
+ <tr>
+ <td>{{ who_global_data_import.date_reported }}</td>
+ <td>{{ who_global_data_import.country }}</td>
+ <td>{{ who_global_data_import.country_code }}</td>
+ <td>{{ who_global_data_import.who_region }}</td>
+ <td>{{ who_global_data_import.new_cases }}</td>
+ <td>{{ who_global_data_import.cumulative_cases }}</td>
+ <td>{{ who_global_data_import.new_deaths }}</td>
+ <td>{{ who_global_data_import.cumulative_deaths }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/who_info.html b/src/covid19/blueprints/who/templates/who/who_info.html
index fd93989d..528e988a 100644
--- a/src/covid19/blueprints/who/templates/who/who_info.html
+++ b/src/covid19/blueprints/who/templates/who/who_info.html
@@ -5,20 +5,22 @@
{% include 'who/fragments/fragment_who_navtabs.html' %}
<div class="container">
- <div class="row-cols-1">
- <h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3>
- <p>
- <a href="https://covid19.who.int/">https://covid19.who.int</a>
- </p>
- </div>
- <div class="row-cols-1">
- <h3>WHO Coronavirus disease (COVID-19) pandemic</h3>
- <p>
- <a href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019">
- https://www.who.int/emergencies/diseases/novel-coronavirus-2019
- </a>
- </p>
- </div>
+ <div class="row">
+ <div class="col">
+ <h3>WHO Coronavirus Disease (COVID-19) Dashboard</h3>
+ <p>
+ <a href="https://covid19.who.int/">https://covid19.who.int</a>
+ </p>
+ </div>
+ <div class="col">
+ <h3>WHO Coronavirus disease (COVID-19) pandemic</h3>
+ <p>
+ <a href="https://www.who.int/emergencies/diseases/novel-coronavirus-2019">
+ https://www.who.int/emergencies/diseases/novel-coronavirus-2019
+ </a>
+ </p>
+ </div>
+ </div>
</div>
{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index 9069d5ea..6553e31b 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -4,36 +4,38 @@
{{super()}}
{% include 'who/fragments/fragment_who_navtabs.html' %}
- <div class="row">
- <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( '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="{{ url_for( 'who.url_task_who_update_star_schema_incremental') }}"
- role="button">WHO :: Task :: update :: star_schema :: incremental</a>
+ <div class="container">
+ <div class="row">
+ <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( '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="{{ url_for( 'who.url_task_who_update_star_schema_incremental') }}"
+ role="button">WHO :: Task :: update :: star_schema :: incremental</a>
+ </div>
</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( '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="{{ 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="{{ 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="{{ 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="{{ url_for( 'who.url_task_who_update_fact_table_initial_only') }}"
- role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
+ <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( '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="{{ 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="{{ 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="{{ 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="{{ url_for( 'who.url_task_who_update_fact_table_initial_only') }}"
+ role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
+ </div>
</div>
- </div>
+ </div>
</div>
{% endblock %}
--
GitLab