From 2bd2f1671880941847fa4efa99764f014dd0ebc5 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 6 Apr 2021 16:07:02 +0200
Subject: [PATCH] template changes
---
src/covid19/blueprints/owid/owid_model.py | 2 --
src/covid19/blueprints/owid/owid_views.py | 4 ++--
.../templates/owid/continent/owid_continent_all.html | 2 +-
.../templates/owid/continent/owid_continent_one.html | 2 +-
.../templates/owid/country/owid_country_all.html | 2 +-
.../owid/country/owid_country_all_table.html | 12 ++++++++++--
.../templates/owid/country/owid_country_one.html | 2 +-
.../owid/country/owid_country_one_germany.html | 2 +-
.../owid/country/owid_country_one_pagination.html | 6 +++---
.../owid/date_reported/owid_date_reported_all.html | 2 +-
.../owid/date_reported/owid_date_reported_one.html | 2 +-
.../owid_date_reported_one_cases_cumulative.html | 2 +-
.../owid_date_reported_one_cases_new.html | 2 +-
.../owid_date_reported_one_deaths_cumulative.html | 2 +-
.../owid_date_reported_one_deaths_new.html | 2 +-
.../owid/templates/owid/imported/owid_imported.html | 2 +-
.../blueprints/owid/templates/owid/owid_info.html | 2 +-
.../blueprints/owid/templates/owid/owid_tasks.html | 5 +----
18 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/covid19/blueprints/owid/owid_model.py b/src/covid19/blueprints/owid/owid_model.py
index a31a4379..0c57f6a6 100644
--- a/src/covid19/blueprints/owid/owid_model.py
+++ b/src/covid19/blueprints/owid/owid_model.py
@@ -194,8 +194,6 @@ class OwidData(db.Model):
).populate_existing().options(
joinedload(cls.country),
joinedload(cls.date_reported),
- ).order_by(
- cls.country.location
).paginate(page, per_page=ITEMS_PER_PAGE)
@classmethod
diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py
index b4b75a0d..d36530d7 100644
--- a/src/covid19/blueprints/owid/owid_views.py
+++ b/src/covid19/blueprints/owid/owid_views.py
@@ -410,7 +410,7 @@ def url_owid_country_one(country_id: int, page: int = 1):
page_info = ApplicationPage(
"country: " + owid_country_one.location,
'OWID',
- "data for OWID continent " + owid_country_one.region + " "
+ "data for OWID continent " + owid_country_one.continent.region + " "
)
try:
page_data = OwidData.get_data_for_country(owid_country_one, page)
@@ -431,7 +431,7 @@ def url_owid_country_one_germany(page: int = 1):
page_info = ApplicationPage(
"country: " + owid_country_one.location,
'OWID',
- "data for OWID continent " + owid_country_one.region + " "
+ "data for OWID continent " + owid_country_one.continent.region + " "
)
try:
page_data = OwidData.get_data_for_country(owid_country_one, page)
diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
index c2ec50a9..3137b1ec 100644
--- a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/continent/owid_continent_all_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
index 4cb0990d..96ccd639 100644
--- a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/continent/owid_continent_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
index c0b3e639..a7cddc47 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/country/owid_country_all_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html
index 41d35c4b..73457f71 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all_table.html
@@ -24,13 +24,21 @@
<tbody>
{% for owid_country in page_data.items %}
<tr>
- <td>{{ owid_country.iso_code }}</td>
+ <td>
+ <a href="{{ url_for( 'owid.url_owid_country_one', country_id=owid_country.id) }}">
+ {{ owid_country.iso_code }}
+ </a>
+ </td>
<td>
<a href="{{ url_for( 'owid.url_owid_continent_one', continent_id=owid_country.continent.id) }}">
{{ owid_country.continent.region }}
</a>
</td>
- <td>{{ owid_country.location }}</td>
+ <td>
+ <a href="{{ url_for( 'owid.url_owid_country_one', country_id=owid_country.id) }}">
+ {{ owid_country.location }}
+ </a>
+ </td>
<td>{{ owid_country.population }}</td>
<td>{{ owid_country.population_density }}</td>
<td>{{ owid_country.median_age }}</td>
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
index 87759338..d1e72c22 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/country/owid_country_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
index 87759338..d1e72c22 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/country/owid_country_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
index 8f1305b5..199068c6 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_pagination.html
@@ -4,7 +4,7 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('owid.url_owid_country_one', page=page_data.prev_num) }}">Previous</a>
+ href="{{ url_for('owid.url_owid_country_one', country_id=owid_country.id, 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('owid.url_owid_country_one', page=page_num) }}">{{ page_num }}</a>
+ href="{{ url_for('owid.url_owid_country_one', country_id=owid_country.id, 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('owid.url_owid_country_one', page=page_data.next_num) }}">Next</a>
+ href="{{ url_for('owid.url_owid_country_one', country_id=owid_country.id, page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
index 1a443f75..fca14b60 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_all_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
index bdd55720..507a19cd 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
index 22a2b8de..9936b1d3 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_cases_cumulative_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
index c83b4949..2c1b5ff2 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_cases_new_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
index a98fb91b..e0c793f4 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_deaths_cumulative_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
index 0cc555e1..6cbae917 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/fragments/fragment_owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/date_reported/owid_date_reported_one_deaths_new_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
index 5f32b6b8..0422eb7d 100644
--- a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
+++ b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
{% include 'owid/imported/owid_imported_pagination.html' %}
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_info.html b/src/covid19/blueprints/owid/templates/owid/owid_info.html
index dd71fb64..6628f1fe 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_info.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_info.html
@@ -4,7 +4,7 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
<div class="card">
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
index d5455944..12a85c1e 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
@@ -4,13 +4,10 @@
{{super()}}
{% include 'owid/navigation/owid_navtabs.html' %}
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for('owid.url_owid_test') }}"
- role="button">OWID :: TEST</a>
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for( 'owid.url_task_owid_update_star_schema_initial') }}"
role="button">OWID :: Task :: update :: star_schema :: initial</a>
--
GitLab