From d2d3f61a476d7a732bc23e8c130d1923b4b180a7 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 29 Apr 2021 19:50:52 +0200
Subject: [PATCH] working on: 0.0.32 Release
---
.../divi/country/divi_country_all.html | 8 ++--
.../country/divi_country_all_pagination.html | 6 +--
.../divi/country/divi_country_all_table.html | 18 ++++----
.../divi/country/divi_country_germany.html | 8 ++--
.../divi_country_germany_pagination.html | 6 +--
.../divi/country/divi_country_one.html | 8 ++--
.../divi_country_one_cases_cumulative.html | 8 ++--
...untry_one_cases_cumulative_pagination.html | 6 +--
.../country/divi_country_one_cases_new.html | 8 ++--
...divi_country_one_cases_new_pagination.html | 6 +--
.../divi_country_one_deaths_cumulative.html | 8 ++--
...ntry_one_deaths_cumulative_pagination.html | 6 +--
.../country/divi_country_one_deaths_new.html | 10 ++---
...ivi_country_one_deaths_new_pagination.html | 6 +--
.../country/divi_country_one_pagination.html | 6 +--
.../divi/country/divi_country_one_table.html | 42 +++++++++----------
.../date_reported/divi_date_reported_all.html | 8 ++--
.../divi_date_reported_all_pagination.html | 6 +--
.../divi_date_reported_all_table.html | 12 +++---
.../date_reported/divi_date_reported_one.html | 8 ++--
...vi_date_reported_one_cases_cumulative.html | 8 ++--
...orted_one_cases_cumulative_pagination.html | 12 +++---
.../divi_date_reported_one_cases_new.html | 8 ++--
...ate_reported_one_cases_new_pagination.html | 12 +++---
...i_date_reported_one_deaths_cumulative.html | 8 ++--
...rted_one_deaths_cumulative_pagination.html | 12 +++---
.../divi_date_reported_one_deaths_new.html | 8 ++--
.../divi_date_reported_one_pagination.html | 12 +++---
.../divi_date_reported_one_table.html | 42 +++++++++----------
.../templates/divi/divi_imported.html | 8 ++--
.../templates/divi/divi_info.html | 2 +-
.../templates/divi/divi_tasks.html | 16 +++----
.../fragment_divi_imported_pagination.html | 6 +--
.../fragment_divi_imported_table.html | 18 ++++----
.../fragment_divi_table_global_data.html | 34 +++++++--------
.../divi/navigation/divi_navbar_dropdown.html | 16 +++----
.../divi/navigation/divi_navtabs.html | 16 +++----
.../divi/region/divi_region_all.html | 8 ++--
.../region/divi_region_all_pagination.html | 6 +--
.../divi/region/divi_region_all_table.html | 8 ++--
.../divi/region/divi_region_one.html | 8 ++--
.../region/divi_region_one_pagination.html | 12 +++---
42 files changed, 237 insertions(+), 237 deletions(-)
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
index da3c31d7..4cf33bb1 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_pagination.html' %}
+ {% include 'divi/country/divi_country_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_table.html' %}
+ {% include 'divi/country/divi_country_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_pagination.html' %}
+ {% include 'divi/country/divi_country_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
index 469047e8..6416bf0c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html
@@ -3,7 +3,7 @@
<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>
+ <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -11,7 +11,7 @@
{% 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -27,7 +27,7 @@
<!-- 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
index 29c2c8c5..9bb422cd 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html
@@ -8,26 +8,26 @@
country code
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">region</a>
+ <a href="{{ url_for('who.url_divi_region_all') }}">region</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_country in page_data.items %}
+ {% for divi_country in page_data.items %}
<tr>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_country.id) }}">
- {{ who_country.country }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}">
+ {{ divi_country.country }}
</a>
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_country.id) }}">
- {{ who_country.country_code }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}">
+ {{ divi_country.country_code }}
</a>
</td>
<th>
- <a href="{{ url_for('who.url_who_region', region_id=who_country.region.id) }}">
- {{ who_country.region.region }}
+ <a href="{{ url_for('who.url_divi_region', region_id=divi_country.region.id) }}">
+ {{ divi_country.region.region }}
</a>
</th>
</tr>
@@ -42,7 +42,7 @@
country code
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">region</a>
+ <a href="{{ url_for('who.url_divi_region_all') }}">region</a>
</th>
</tr>
</tfoot>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
index cd4675fa..2ed20c2c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_germany_pagination.html' %}
+ {% include 'divi/country/divi_country_germany_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_germany_pagination.html' %}
+ {% include 'divi/country/divi_country_germany_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
index 3aaba2d4..2f158697 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html
@@ -3,7 +3,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
index 7f61469f..2df75599 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
@@ -2,21 +2,21 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_pagination.html' %}
+ {% include 'divi/country/divi_country_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="col">
- {% include 'who/country/who_country_one_pagination.html' %}
+ {% include 'divi/country/divi_country_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
index 5aae35be..52ffbeb0 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_cumulative_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_cumulative_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
index 9853cced..ed138a32 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html
@@ -3,7 +3,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
index a522b64c..2de05893 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_new_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_new_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_new_pagination.html' %}
+ {% include 'divi/country/divi_country_one_cases_new_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
index fce53cfa..5fe0b4fd 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html
@@ -3,7 +3,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
index d55e49fc..204f2135 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_deaths_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_deaths_cumulative_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_deaths_cumulative_pagination.html' %}
+ {% include 'divi/country/divi_country_one_deaths_cumulative_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
index cce38e1b..b21dd80b 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html
@@ -3,7 +3,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
index 6a771b79..ef88f3ca 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
@@ -12,7 +12,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -22,7 +22,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -40,7 +40,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
@@ -51,7 +51,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'divi/country/divi_country_one_table.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
index 9a88e670..b1471e8c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html
@@ -3,7 +3,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
index c2561c3e..ac27722a 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html
@@ -3,7 +3,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -13,7 +13,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -31,7 +31,7 @@
{% 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) }}">
+ href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
index f8537ede..5183d720 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html
@@ -2,80 +2,80 @@
<thead class="table-secondary">
<tr>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_all') }}">
+ <a href="{{ url_for('who.url_divi_date_reported_all') }}">
date reported
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_deaths_new',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_deaths_new',country_id=divi_country.id) }}">
deaths new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_cases_new',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_cases_new',country_id=divi_country.id) }}">
cases new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_deaths_cumulative',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_deaths_cumulative',country_id=divi_country.id) }}">
deaths cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_cases_cumulative',country_id=who_country.id) }}">
+ <a href="{{ url_for('who.url_divi_country_cases_cumulative',country_id=divi_country.id) }}">
cases cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country code
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">
+ <a href="{{ url_for('who.url_divi_region_all') }}">
region
</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_global_data in page_data.items %}
+ {% for divi_global_data in page_data.items %}
<tr>
<th>
- <a href="{{ url_for('who.url_who_date_reported',date_reported_id=who_global_data.date_reported.id) }}">
- {{ who_global_data.date_reported }}
+ <a href="{{ url_for('who.url_divi_date_reported',date_reported_id=divi_global_data.date_reported.id) }}">
+ {{ divi_global_data.date_reported }}
</a>
</th>
<td>
- {{ who_global_data.deaths_new }}
+ {{ divi_global_data.deaths_new }}
</td>
<td>
- {{ who_global_data.cases_new }}
+ {{ divi_global_data.cases_new }}
</td>
<td>
- {{ who_global_data.deaths_cumulative }}
+ {{ divi_global_data.deaths_cumulative }}
</td>
<td>
- {{ who_global_data.cases_cumulative }}
+ {{ divi_global_data.cases_cumulative }}
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id) }}">
- {{ who_global_data.country.country_code }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+ {{ divi_global_data.country.country_code }}
</a>
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id) }}">
- {{ who_global_data.country.country }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+ {{ divi_global_data.country.country }}
</a>
</td>
<th>
- <a href="{{ url_for('who.url_who_region', region_id=who_global_data.country.region.id) }}">
- {{ who_global_data.country.region.region }}
+ <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}">
+ {{ divi_global_data.country.region.region }}
</a>
</th>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
index eea1d5da..fb27e464 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
index 34348791..135fc922 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
@@ -3,7 +3,7 @@
<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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -11,7 +11,7 @@
{% 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -27,7 +27,7 @@
<!-- 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
index ef541983..71fc780b 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
@@ -8,21 +8,21 @@
</tr>
</thead>
<tbody>
- {% for who_date_reported in page_data.items %}
+ {% for divi_date_reported in page_data.items %}
<tr>
<td class="text-right">
- {{ who_date_reported.get_name_for_weekday() }}
+ {{ divi_date_reported.get_name_for_weekday() }}
</td>
<td class="text-left">
- <a href="/who/date_reported/{{ who_date_reported.id }}">
- {{ who_date_reported }}
+ <a href="/who/date_reported/{{ divi_date_reported.id }}">
+ {{ divi_date_reported }}
</a>
</td>
<td class="text-right">
- {{ who_date_reported.week_of_year }}
+ {{ divi_date_reported.week_of_year }}
</td>
<td class="text-left">
- {{ who_date_reported.year }}
+ {{ divi_date_reported.year }}
</td>
</tr>
{% endfor %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
index fb852908..ca967bda 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
index 2e6562a5..a5a52426 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
{% endblock %}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
index 3b618854..02c1fbb8 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
@@ -3,8 +3,8 @@
<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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,8 @@
{% 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,8 @@
<!-- 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
index fb852908..ca967bda 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
index dc078243..5f553699 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html
@@ -3,8 +3,8 @@
<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) }}">
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -14,8 +14,8 @@
{% 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -31,8 +31,8 @@
<!-- 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
index 6cade560..f296b137 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
index 3b618854..02c1fbb8 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html
@@ -3,8 +3,8 @@
<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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,8 @@
{% 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,8 @@
<!-- 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
index c61e0d19..3e5b2332 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'divi/date_reported/divi_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
index 7938fbcd..aba8dcc6 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html
@@ -3,8 +3,8 @@
<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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+ date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,8 @@
{% 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+ date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,8 @@
<!-- 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>
+ <a class="page-link" href="{{ url_for('who.url_divi_date_reported',
+ date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
index 5dd91bb5..abd0e2f0 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html
@@ -2,80 +2,80 @@
<thead class="table-secondary">
<tr>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_all') }}">
+ <a href="{{ url_for('who.url_divi_date_reported_all') }}">
date reported
</a>
</th>
<th scope="col"> who.
- <a href="{{ url_for('who.url_who_date_reported_deaths_new', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_deaths_new', date_reported_id=divi_date_reported.id) }}">
deaths new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_cases_new', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id) }}">
cases new
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_deaths_cumulative', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id) }}">
deaths cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_date_reported_cases_cumulative', date_reported_id=who_date_reported.id) }}">
+ <a href="{{ url_for('who.url_divi_date_reported_cases_cumulative', date_reported_id=divi_date_reported.id) }}">
cases cumulative
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country code
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_country_all') }}">
+ <a href="{{ url_for('who.url_divi_country_all') }}">
country
</a>
</th>
<th scope="col">
- <a href="{{ url_for('who.url_who_region_all') }}">
+ <a href="{{ url_for('who.url_divi_region_all') }}">
region
</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_global_data in page_data.items %}
+ {% for divi_global_data in page_data.items %}
<tr>
<th>
- <a href="{{ url_for('who.url_who_date_reported', date_reported_id=who_global_data.date_reported.id) }}">
- {{ who_global_data.date_reported }}
+ <a href="{{ url_for('who.url_divi_date_reported', date_reported_id=divi_global_data.date_reported.id) }}">
+ {{ divi_global_data.date_reported }}
</a>
</th>
<td>
- {{ who_global_data.deaths_new }}
+ {{ divi_global_data.deaths_new }}
</td>
<td>
- {{ who_global_data.cases_new }}
+ {{ divi_global_data.cases_new }}
</td>
<td>
- {{ who_global_data.deaths_cumulative }}
+ {{ divi_global_data.deaths_cumulative }}
</td>
<td>
- {{ who_global_data.cases_cumulative }}
+ {{ divi_global_data.cases_cumulative }}
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id ) }}">
- {{ who_global_data.country.country_code }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id ) }}">
+ {{ divi_global_data.country.country_code }}
</a>
</td>
<td>
- <a href="{{ url_for('who.url_who_country', country_id=who_global_data.country.id) }}">
- {{ who_global_data.country.country }}
+ <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}">
+ {{ divi_global_data.country.country }}
</a>
</td>
<th>
- <a href="{{ url_for('who.url_who_region', region_id=who_global_data.country.region.id) }}">
- {{ who_global_data.country.region.region }}
+ <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}">
+ {{ divi_global_data.country.region.region }}
</a>
</th>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
index d12fed01..8dbdc546 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_pagination.html' %}
+ {% include 'divi/fragments/fragment_divi_imported_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_table.html' %}
+ {% include 'divi/fragments/fragment_divi_imported_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_pagination.html' %}
+ {% include 'divi/fragments/fragment_divi_imported_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
index 43bb0444..9aea2eeb 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
index 51281f27..5baf486a 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
@@ -2,36 +2,36 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<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') }}"
+ href="{{ url_for( 'who.url_task_divi_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') }}"
+ href="{{ url_for( 'who.url_task_divi_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-success btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_download_only') }}"
+ href="{{ url_for( 'who.url_task_divi_download_only') }}"
role="button">WHO :: Task :: download :: only</a>
<a class="btn btn-info btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_import_only') }}"
+ href="{{ url_for( 'who.url_task_divi_import_only') }}"
role="button">WHO :: Task :: import :: only</a>
<a class="btn btn-warning btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_update_dimension_tables_only') }}"
+ href="{{ url_for( 'who.url_task_divi_update_dimension_tables_only') }}"
role="button">WHO :: Task :: update :: dimension-tables : only</a>
<a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_task_who_update_fact_table_incremental_only') }}"
+ href="{{ url_for( 'who.url_task_divi_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') }}"
+ href="{{ url_for( 'who.url_task_divi_update_fact_table_initial_only') }}"
role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
index d0d56482..a0f6a956 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html
@@ -4,7 +4,7 @@
{% 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>
+ href="{{ url_for('who.url_divi_imported', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -13,7 +13,7 @@
{% 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>
+ href="{{ url_for('who.url_divi_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -30,7 +30,7 @@
{% 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>
+ href="{{ url_for('who.url_divi_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
index 941f320b..55571bff 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_table.html
@@ -12,16 +12,16 @@
</tr>
</thead>
<tbody>
- {% for who_global_data_import in page_data.items %}
+ {% for divi_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>
+ <td>{{ divi_global_data_import.date_reported }}</td>
+ <td>{{ divi_global_data_import.country }}</td>
+ <td>{{ divi_global_data_import.country_code }}</td>
+ <td>{{ divi_global_data_import.divi_region }}</td>
+ <td>{{ divi_global_data_import.new_cases }}</td>
+ <td>{{ divi_global_data_import.cumulative_cases }}</td>
+ <td>{{ divi_global_data_import.new_deaths }}</td>
+ <td>{{ divi_global_data_import.cumulative_deaths }}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
index 90049ac2..9f75943a 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html
@@ -2,7 +2,7 @@
<thead class="table-secondary">
<tr>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ <a href="{{ url_for( 'who.url_divi_date_reported_all') }}">
date reported
</a>
</th>
@@ -19,47 +19,47 @@
cases cumulative
</th>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_country_all') }}">
+ <a href="{{ url_for( 'who.url_divi_country_all') }}">
country code
</a>
</th>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_country_all') }}">
+ <a href="{{ url_for( 'who.url_divi_country_all') }}">
country
</a>
</th>
<th scope="col">
- <a href="{{ url_for( 'who.url_who_region_all') }}">
+ <a href="{{ url_for( 'who.url_divi_region_all') }}">
region
</a>
</th>
</tr>
</thead>
<tbody>
- {% for who_global_data in page_data.items %}
+ {% for divi_global_data in page_data.items %}
<tr>
<th>
- <a href="/who/date_reported/{{ who_global_data.date_reported.id }}">
- {{ who_global_data.date_reported }}
+ <a href="/who/date_reported/{{ divi_global_data.date_reported.id }}">
+ {{ divi_global_data.date_reported }}
</a>
</th>
- <td>{{ who_global_data.deaths_new }}</td>
- <td>{{ who_global_data.cases_new }}</td>
- <td>{{ who_global_data.deaths_cumulative }}</td>
- <td>{{ who_global_data.cases_cumulative }}</td>
+ <td>{{ divi_global_data.deaths_new }}</td>
+ <td>{{ divi_global_data.cases_new }}</td>
+ <td>{{ divi_global_data.deaths_cumulative }}</td>
+ <td>{{ divi_global_data.cases_cumulative }}</td>
<td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country_code }}
+ <a href="/who/country/{{ divi_global_data.country.id }}">
+ {{ divi_global_data.country.country_code }}
</a>
</td>
<td>
- <a href="/who/country/{{ who_global_data.country.id }}">
- {{ who_global_data.country.country }}
+ <a href="/who/country/{{ divi_global_data.country.id }}">
+ {{ divi_global_data.country.country }}
</a>
</td>
<th>
- <a href="/who/region/{{ who_global_data.country.region.id }}">
- {{ who_global_data.country.region.region }}
+ <a href="/who/region/{{ divi_global_data.country.region.id }}">
+ {{ divi_global_data.country.region.region }}
</a>
</th>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
index 2c2e5a9d..efed2bfd 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
@@ -4,7 +4,7 @@
</a>
<ul class="dropdown-menu">
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_date_reported_all') }}">
WHO
</a>
</li>
@@ -12,7 +12,7 @@
<div class="dropdown-divider"></div>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_germany') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_germany') }}">
WHO Germany
</a>
</li>
@@ -20,17 +20,17 @@
<div class="dropdown-divider"></div>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_region_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_region_all') }}">
WHO Regions
</a>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_date_reported_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_date_reported_all') }}">
WHO Date Reported
</a>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_country_all') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_country_all') }}">
WHO Countries
</a>
</li>
@@ -39,7 +39,7 @@
</li>
{% if current_user.is_authenticated %}
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_imported') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_imported') }}">
WHO imported
</a>
</li>
@@ -48,13 +48,13 @@
<div class="dropdown-divider"></div>
</li>
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_info') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_info') }}">
WHO Info
</a>
</li>
{% if current_user.is_authenticated %}
<li>
- <a class="dropdown-item" href="{{ url_for( 'who.url_who_tasks') }}">
+ <a class="dropdown-item" href="{{ url_for( 'who.url_divi_tasks') }}">
WHO Tasks
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
index 032b51dc..7d26db70 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
@@ -6,40 +6,40 @@
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_info') }}">WHO Info</a>
+ href="{{ url_for( 'who.url_divi_info') }}">WHO Info</a>
</li>
{% if current_user.is_authenticated %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_tasks') }}">WHO tasks</a>
+ href="{{ url_for( 'who.url_divi_tasks') }}">WHO tasks</a>
</li>
{% endif %}
{% if current_user.is_authenticated %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who_test.url_who_test_tests') }}">WHO Tests</a>
+ href="{{ url_for( 'divi_test.url_divi_test_tests') }}">WHO Tests</a>
</li>
{% endif %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_date_reported_all') }}">WHO Date Reported</a>
+ href="{{ url_for( 'who.url_divi_date_reported_all') }}">WHO Date Reported</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_germany') }}">WHO Germany</a>
+ href="{{ url_for( 'who.url_divi_germany') }}">WHO Germany</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_region_all') }}">WHO Regions</a>
+ href="{{ url_for( 'who.url_divi_region_all') }}">WHO Regions</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_country_all') }}">WHO Countries</a>
+ href="{{ url_for( 'who.url_divi_country_all') }}">WHO Countries</a>
</li>
{% if current_user.is_authenticated %}
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'who.url_who_imported') }}">WHO imported</a>
+ href="{{ url_for( 'who.url_divi_imported') }}">WHO imported</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
index 12960224..54bb8dc1 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
@@ -2,22 +2,22 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_pagination.html' %}
+ {% include 'divi/region/divi_region_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_table.html' %}
+ {% include 'divi/region/divi_region_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_pagination.html' %}
+ {% include 'divi/region/divi_region_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
index 35f878b3..54554445 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
@@ -4,7 +4,7 @@
<!-- previous page -->
{% if page_data.has_prev %}
<li>
- <a href="{{ url_for('who.url_who_region_all', page=page_data.prev_num) }}">
+ <a href="{{ url_for('who.url_divi_region_all', page=page_data.prev_num) }}">
Previous
</a>
</li>
@@ -14,7 +14,7 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li>
- <a href="{{ url_for('who.url_who_region_all', page=page_num) }}">
+ <a href="{{ url_for('who.url_divi_region_all', page=page_num) }}">
{{ page_num }}
</a>
</li>
@@ -32,7 +32,7 @@
<!-- next page -->
{% if page_data.has_next %}
<li>
- <a href="{{ url_for('who.url_who_region_all', page=page_data.next_num) }}">
+ <a href="{{ url_for('who.url_divi_region_all', page=page_data.next_num) }}">
Next
</a>
</li>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
index a62785a5..496da52c 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
@@ -2,15 +2,15 @@
<table class="table table-hover table-striped table-dark">
<thead>
<tr>
- <th scope="col">who_region</th>
+ <th scope="col">divi_region</th>
</tr>
</thead>
<tbody>
- {% for who_region in page_data.items %}
+ {% for divi_region in page_data.items %}
<tr>
<td>
- <a href="/who/region/{{ who_region.id }}">
- {{ who_region.region }}
+ <a href="/who/region/{{ divi_region.id }}">
+ {{ divi_region.region }}
</a>
</td>
</tr>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
index e2731033..1847e5d5 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
@@ -2,24 +2,24 @@
{% block content %}
{{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
+ {% include 'divi/navigation/divi_navtabs.html' %}
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/region/who_region_one_pagination.html' %}
+ {% include 'divi/region/divi_region_one_pagination.html' %}
</div>
</div>
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_table.html' %}
+ {% include 'divi/country/divi_country_all_table.html' %}
</div>
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_one_pagination.html' %}
+ {% include 'divi/region/divi_region_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
index ad18ea25..fe39c125 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
@@ -3,8 +3,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_divi_region',
+ region_id=divi_region.id , page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -12,8 +12,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_divi_region',
+ region_id=divi_region.id ,page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -29,8 +29,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_divi_region',
+ region_id=divi_region.id , page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
--
GitLab