From cb41e172a08935a7cd4ed884447863b8c7f0b095 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 25 May 2021 21:47:59 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../who_country_all.html} | 10 +++---
.../{ => all}/who_country_all_pagination.html | 0
.../{ => all}/who_country_all_table.html | 0
.../who_country_one_cases_cumulative.html | 6 ++--
...untry_one_cases_cumulative_pagination.html | 0
.../who_country_one_cases_new.html} | 6 ++--
.../who_country_one_cases_new_pagination.html | 0
.../who_country_one_deaths_cumulative.html | 34 +++++++++++++++++++
...ntry_one_deaths_cumulative_pagination.html | 0
.../who_country_one_deaths_new.html | 2 +-
...who_country_one_deaths_new_pagination.html | 0
.../who_country_germany.html} | 7 ++--
.../who_country_germany_pagination.html | 0
.../country/{ => one}/who_country_one.html | 6 ++--
.../{ => one}/who_country_one_pagination.html | 0
.../{ => one}/who_country_one_table.html | 0
.../who/country/who_country_all.html | 33 ------------------
.../fragment_who_table_global_data.html | 0
.../{ => all}/who_date_reported_all.html | 6 ++--
.../who_date_reported_all_pagination.html | 0
.../who_date_reported_all_table.html | 0
...ho_date_reported_one_cases_cumulative.html | 6 ++--
...orted_one_cases_cumulative_pagination.html | 0
.../who_date_reported_one_cases_new.html | 6 ++--
...ate_reported_one_cases_new_pagination.html | 0
...o_date_reported_one_deaths_cumulative.html | 6 ++--
...rted_one_deaths_cumulative_pagination.html | 0
.../who_date_reported_one_deaths_new.html | 6 ++--
.../{ => one}/who_date_reported_one.html | 6 ++--
.../who_date_reported_one_pagination.html | 0
.../who_date_reported_one_table.html | 0
.../fragment_who_flat_pagination.html | 0
.../fragment_who_flat_table.html | 0
.../fragment_who_imported_pagination.html | 0
.../fragment_who_imported_table.html | 0
.../who/region/{ => all}/who_region_all.html | 6 ++--
.../{ => all}/who_region_all_pagination.html | 0
.../{ => all}/who_region_all_table.html | 0
.../who/region/{ => one}/who_region_one.html | 6 ++--
.../{ => one}/who_region_one_pagination.html | 0
.../data_who/templates/who/who_flat.html | 6 ++--
.../data_who/templates/who/who_imported.html | 6 ++--
.../blueprints/data_who/who_views.py | 30 ++++++++--------
43 files changed, 97 insertions(+), 97 deletions(-)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{who_country_germany.html => all/who_country_all.html} (74%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => all}/who_country_all_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => all}/who_country_all_table.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => cases}/who_country_one_cases_cumulative.html (69%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => cases}/who_country_one_cases_cumulative_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{who_country_one_deaths_cumulative.html => cases/who_country_one_cases_new.html} (70%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => cases}/who_country_one_cases_new_pagination.html (100%)
create mode 100644 src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_cumulative.html
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => deaths}/who_country_one_deaths_cumulative_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => deaths}/who_country_one_deaths_new.html (96%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => deaths}/who_country_one_deaths_new_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{who_country_one_cases_new.html => germany/who_country_germany.html} (71%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => germany}/who_country_germany_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => one}/who_country_one.html (71%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => one}/who_country_one_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/country/{ => one}/who_country_one_table.html (100%)
delete mode 100644 src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all.html
rename src/flask_covid19/blueprints/data_who/templates/who/{fragments => data}/fragment_who_table_global_data.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => all}/who_date_reported_all.html (69%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => all}/who_date_reported_all_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => all}/who_date_reported_all_table.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => cases}/who_date_reported_one_cases_cumulative.html (69%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => cases}/who_date_reported_one_cases_cumulative_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => cases}/who_date_reported_one_cases_new.html (69%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => cases}/who_date_reported_one_cases_new_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => deaths}/who_date_reported_one_deaths_cumulative.html (69%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => deaths}/who_date_reported_one_deaths_cumulative_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => deaths}/who_date_reported_one_deaths_new.html (69%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => one}/who_date_reported_one.html (69%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => one}/who_date_reported_one_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/date_reported/{ => one}/who_date_reported_one_table.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/{fragments => flat}/fragment_who_flat_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/{fragments => flat}/fragment_who_flat_table.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/{fragments => imported}/fragment_who_imported_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/{fragments => imported}/fragment_who_imported_table.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/region/{ => all}/who_region_all.html (73%)
rename src/flask_covid19/blueprints/data_who/templates/who/region/{ => all}/who_region_all_pagination.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/region/{ => all}/who_region_all_table.html (100%)
rename src/flask_covid19/blueprints/data_who/templates/who/region/{ => one}/who_region_one.html (74%)
rename src/flask_covid19/blueprints/data_who/templates/who/region/{ => one}/who_region_one_pagination.html (100%)
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_germany.html b/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all.html
similarity index 74%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_germany.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all.html
index dbdcd2aa..9642a641 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_germany.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all.html
@@ -7,22 +7,22 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_germany_pagination.html' %}
+ {% include 'who/country/all/who_country_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'who/country/all/who_country_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_germany_pagination.html' %}
+ {% include 'who/country/all/who_country_all_pagination.html' %}
</div>
</div>
</div>
-{% endblock %}
+{% endblock %}
{% block footer_container %}
<div>
@@ -30,4 +30,4 @@
<h4>{{ error }}</h4>
{% endfor %}
</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all_table.html b/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all_table.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_table.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_cumulative.html b/src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_cumulative.html
similarity index 69%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_cumulative.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_cumulative.html
index a333e712..eaa03fb0 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_cumulative.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_cumulative.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_cumulative_pagination.html' %}
+ {% include 'who/country/cases/who_country_one_cases_cumulative_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'who/country/one/who_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_cumulative_pagination.html' %}
+ {% include 'who/country/cases/who_country_one_cases_cumulative_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_cumulative_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_cumulative_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_cumulative_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_cumulative_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_cumulative.html b/src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_new.html
similarity index 70%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_cumulative.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_new.html
index 7eaa7e54..f0bfb5b7 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_cumulative.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_new.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_deaths_cumulative_pagination.html' %}
+ {% include 'who/country/cases/who_country_one_cases_new_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'who/country/one/who_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_deaths_cumulative_pagination.html' %}
+ {% include 'who/country/cases/who_country_one_cases_new_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_new_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_new_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_new_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/cases/who_country_one_cases_new_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_cumulative.html b/src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_cumulative.html
new file mode 100644
index 00000000..a0083278
--- /dev/null
+++ b/src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_cumulative.html
@@ -0,0 +1,34 @@
+{% extends 'app_application/layout/page_layout.html' %}
+
+{% block content %}
+ {{super()}}
+ {% include 'who/navigation/who_navtabs.html' %}
+
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% include 'who/country/deaths/who_country_one_deaths_cumulative_pagination.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/country/one/who_country_one_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/country/deaths/who_country_one_deaths_cumulative_pagination.html' %}
+ </div>
+ </div>
+ </div>
+
+{% endblock %}
+
+
+{% block footer_container %}
+ <div>
+ {% for error in errors %}
+ <h4>{{ error }}</h4>
+ {% endfor %}
+ </div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_cumulative_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_cumulative_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_cumulative_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_cumulative_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_new.html b/src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_new.html
similarity index 96%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_new.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_new.html
index a840a3ab..322aea72 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_new.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_new.html
@@ -51,7 +51,7 @@
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'who/country/one/who_country_one_table.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_new_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_new_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_deaths_new_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/deaths/who_country_one_deaths_new_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_new.html b/src/flask_covid19/blueprints/data_who/templates/who/country/germany/who_country_germany.html
similarity index 71%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_new.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/germany/who_country_germany.html
index 21fa158f..00d7a436 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_cases_new.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/country/germany/who_country_germany.html
@@ -7,21 +7,20 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_new_pagination.html' %}
+ {% include 'who/country/germany/who_country_germany_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'who/country/one/who_country_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_cases_new_pagination.html' %}
+ {% include 'who/country/germany/who_country_germany_pagination.html' %}
</div>
</div>
</div>
-
{% endblock %}
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_germany_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/country/germany/who_country_germany_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_germany_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/germany/who_country_germany_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one.html b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one.html
similarity index 71%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one.html
index ed1d1850..ef006dd2 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one.html
@@ -7,16 +7,16 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_pagination.html' %}
+ {% include 'who/country/one/who_country_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/country/who_country_one_table.html' %}
+ {% include 'who/country/one/who_country_one_table.html' %}
</div>
</div>
<div class="col">
- {% include 'who/country/who_country_one_pagination.html' %}
+ {% include 'who/country/one/who_country_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_table.html b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/country/who_country_one_table.html
rename to src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all.html b/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all.html
deleted file mode 100644
index fc9cef64..00000000
--- a/src/flask_covid19/blueprints/data_who/templates/who/country/who_country_all.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends 'app_application/layout/page_layout.html' %}
-
-{% block content %}
- {{super()}}
- {% include 'who/navigation/who_navtabs.html' %}
-
- <div class="container">
- <div class="row">
- <div class="col">
- {% include 'who/country/who_country_all_pagination.html' %}
- </div>
- </div>
- <div class="row">
- <div class="col">
- {% include 'who/country/who_country_all_table.html' %}
- </div>
- </div>
- <div class="row">
- <div class="col">
- {% include 'who/country/who_country_all_pagination.html' %}
- </div>
- </div>
- </div>
-
-{% endblock %}
-
-{% block footer_container %}
- <div>
- {% for error in errors %}
- <h4>{{ error }}</h4>
- {% endfor %}
- </div>
-{% endblock %}
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_table_global_data.html b/src/flask_covid19/blueprints/data_who/templates/who/data/fragment_who_table_global_data.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_table_global_data.html
rename to src/flask_covid19/blueprints/data_who/templates/who/data/fragment_who_table_global_data.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_all.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all.html
similarity index 69%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_all.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all.html
index 3d86dbaa..813fe2ed 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_all.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
+ {% include 'who/date_reported/all/who_date_reported_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_table.html' %}
+ {% include 'who/date_reported/all/who_date_reported_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
+ {% include 'who/date_reported/all/who_date_reported_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_all_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_all_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_all_table.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_all_table.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_cumulative.html
similarity index 69%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_cumulative.html
index 3c474ad6..a48afafd 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_cumulative.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
{% endblock %}
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_cumulative_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_cumulative_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_new.html
similarity index 69%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_new.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_new.html
index 0681a992..edf78a68 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_new.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_new_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/cases/who_date_reported_one_cases_new_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_cumulative.html
similarity index 69%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_cumulative.html
index 1f6f0589..4a61ad43 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_cumulative.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_cumulative_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_cumulative_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_new.html
similarity index 69%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_new.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_new.html
index 99251840..71d86c3f 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/deaths/who_date_reported_one_deaths_new.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one.html
similarity index 69%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one.html
index 0681a992..edf78a68 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
+ {% include 'who/date_reported/one/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_table.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/date_reported/who_date_reported_one_table.html
rename to src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_flat_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/flat/fragment_who_flat_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_flat_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/flat/fragment_who_flat_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_flat_table.html b/src/flask_covid19/blueprints/data_who/templates/who/flat/fragment_who_flat_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_flat_table.html
rename to src/flask_covid19/blueprints/data_who/templates/who/flat/fragment_who_flat_table.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_imported_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/imported/fragment_who_imported_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_imported_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/imported/fragment_who_imported_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_imported_table.html b/src/flask_covid19/blueprints/data_who/templates/who/imported/fragment_who_imported_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/fragments/fragment_who_imported_table.html
rename to src/flask_covid19/blueprints/data_who/templates/who/imported/fragment_who_imported_table.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/region/who_region_all.html b/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all.html
similarity index 73%
rename from src/flask_covid19/blueprints/data_who/templates/who/region/who_region_all.html
rename to src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all.html
index 2fb03601..21ad8246 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/region/who_region_all.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_pagination.html' %}
+ {% include 'who/region/all/who_region_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_table.html' %}
+ {% include 'who/region/all/who_region_all_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_all_pagination.html' %}
+ {% include 'who/region/all/who_region_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/region/who_region_all_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/region/who_region_all_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/region/who_region_all_table.html b/src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/region/who_region_all_table.html
rename to src/flask_covid19/blueprints/data_who/templates/who/region/all/who_region_all_table.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/region/who_region_one.html b/src/flask_covid19/blueprints/data_who/templates/who/region/one/who_region_one.html
similarity index 74%
rename from src/flask_covid19/blueprints/data_who/templates/who/region/who_region_one.html
rename to src/flask_covid19/blueprints/data_who/templates/who/region/one/who_region_one.html
index f4d57f4e..26a3fd18 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/region/who_region_one.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/region/one/who_region_one.html
@@ -7,19 +7,19 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/region/who_region_one_pagination.html' %}
+ {% include 'who/region/one/who_region_one_pagination.html' %}
</div>
</div>
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/country/who_country_all_table.html' %}
+ {% include 'who/country/all/who_country_all_table.html' %}
</div>
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/region/who_region_one_pagination.html' %}
+ {% include 'who/region/one/who_region_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/region/who_region_one_pagination.html b/src/flask_covid19/blueprints/data_who/templates/who/region/one/who_region_one_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_who/templates/who/region/who_region_one_pagination.html
rename to src/flask_covid19/blueprints/data_who/templates/who/region/one/who_region_one_pagination.html
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/who_flat.html b/src/flask_covid19/blueprints/data_who/templates/who/who_flat.html
index fcf2754b..384ec910 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/who_flat.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/who_flat.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_flat_pagination.html' %}
+ {% include 'who/fragments/flat/fragment_who_flat_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_flat_table.html' %}
+ {% include 'who/fragments/flat/fragment_who_flat_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_flat_pagination.html' %}
+ {% include 'who/fragments/flat/fragment_who_flat_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/templates/who/who_imported.html b/src/flask_covid19/blueprints/data_who/templates/who/who_imported.html
index 675cd2bf..8f44e1a9 100644
--- a/src/flask_covid19/blueprints/data_who/templates/who/who_imported.html
+++ b/src/flask_covid19/blueprints/data_who/templates/who/who_imported.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_pagination.html' %}
+ {% include 'who/fragments/imported/fragment_who_imported_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_table.html' %}
+ {% include 'who/fragments/imported/fragment_who_imported_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_imported_pagination.html' %}
+ {% include 'who/fragments/imported/fragment_who_imported_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/flask_covid19/blueprints/data_who/who_views.py b/src/flask_covid19/blueprints/data_who/who_views.py
index 44efbf49..259d5ef7 100644
--- a/src/flask_covid19/blueprints/data_who/who_views.py
+++ b/src/flask_covid19/blueprints/data_who/who_views.py
@@ -88,7 +88,7 @@ def url_who_date_reported_all(page: int = 1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_all.html',
+ 'who/date_reported/all/who_date_reported_all.html',
page_data=page_data,
page_info=page_info)
@@ -108,7 +108,7 @@ def url_who_date_reported(date_reported_id: int, page: int = 1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one.html',
+ 'who/date_reported/one/who_date_reported_one.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -129,7 +129,7 @@ def url_who_date_reported_cases_new(date_reported_id: int, page: int = 1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_cases_new.html',
+ 'who/date_reported/cases/who_date_reported_one_cases_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -150,7 +150,7 @@ def url_who_date_reported_cases_cumulative(date_reported_id: int, page: int = 1)
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_cases_cumulative.html',
+ 'who/date_reported/cases/who_date_reported_one_cases_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -171,7 +171,7 @@ def url_who_date_reported_deaths_new(date_reported_id: int, page: int = 1):
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_deaths_new.html',
+ 'who/date_reported/deaths/who_date_reported_one_deaths_new.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -192,7 +192,7 @@ def url_who_date_reported_deaths_cumulative(date_reported_id: int, page: int = 1
flash("No data in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_one_deaths_cumulative.html',
+ 'who/date_reported/deaths/who_date_reported_one_deaths_cumulative.html',
who_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
@@ -208,7 +208,7 @@ def url_who_region_all(page: int = 1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'who/region/who_region_all.html',
+ 'who/region/all/who_region_all.html',
page_data=page_data,
page_info=page_info)
@@ -228,7 +228,7 @@ def url_who_region(region_id: int, page: int = 1):
flash("No countries of that region in the database.")
page_data = None
return render_template(
- 'who/region/who_region_one.html',
+ 'who/region/one/who_region_one.html',
who_region=who_region,
page_data=page_data,
page_info=page_info)
@@ -244,7 +244,7 @@ def url_who_country_all(page: int = 1):
flash("No regions in the database.")
page_data = None
return render_template(
- 'who/country/who_country_all.html',
+ 'who/country/all/who_country_all.html',
page_data=page_data,
page_info=page_info)
@@ -258,7 +258,7 @@ def url_who_country(country_id: int, page: int = 1):
"Country " + who_country.location,
"Data per Day in Country " + str(who_country))
return render_template(
- 'who/country/who_country_one.html',
+ 'who/country/one/who_country_one.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -273,7 +273,7 @@ def url_who_country_cases_new(country_id: int, page: int = 1):
"Country " + who_country.location,
"Data per Day in Country " + str(who_country))
return render_template(
- 'who/country/who_country_one_cases_new.html',
+ 'who/country/cases/who_country_one_cases_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -288,7 +288,7 @@ def url_who_country_cases_cumulative(country_id: int, page: int = 1):
"Country " + who_country.location,
"Data per Day in Country " + str(who_country))
return render_template(
- 'who/country/who_country_one_cases_cumulative.html',
+ 'who/country/cases/who_country_one_cases_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -303,7 +303,7 @@ def url_who_country_deaths_new(country_id: int, page: int = 1):
"Country " + who_country.location,
"Data per Day in Country " + str(who_country))
return render_template(
- 'who/country/who_country_one_deaths_new.html',
+ 'who/country/deaths/who_country_one_deaths_new.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -318,7 +318,7 @@ def url_who_country_deaths_cumulative(country_id: int, page: int = 1):
"Country " + who_country.location,
"Data per Day in Country " + str(who_country))
return render_template(
- 'who/country/who_country_one_deaths_cumulative.html',
+ 'who/country/deaths/who_country_one_deaths_cumulative.html',
who_country=who_country,
page_data=page_data,
page_info=page_info)
@@ -334,7 +334,7 @@ def url_who_germany(page: int = 1):
return redirect(url_for('who.url_who_info'))
page_data = WhoData.find_page_by_location(who_country_germany, page)
return render_template(
- 'who/country/who_country_germany.html',
+ 'who/country/germany/who_country_germany.html',
who_country=who_country_germany,
page_data=page_data,
page_info=page_info)
--
GitLab