From 1c72d9f2e3da753f597f3dac9b892a392e63a8bf Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 6 Apr 2021 14:33:28 +0200
Subject: [PATCH] template changes
---
.../country/owid_country_one_germany.html | 29 ++++
.../owid_country_one_germany_pagination.html} | 0
.../fragment_owid_table_global_data.html | 38 -----
.../fragments/fragment_owid_test_table.html | 131 ------------------
4 files changed, 29 insertions(+), 169 deletions(-)
create mode 100644 src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
rename src/covid19/blueprints/owid/templates/owid/{fragments/fragment_owid_test_pagination.html => country/owid_country_one_germany_pagination.html} (100%)
delete mode 100644 src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data.html
delete mode 100644 src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_test_table.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
new file mode 100644
index 00000000..1dc19832
--- /dev/null
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
@@ -0,0 +1,29 @@
+{% extends 'application/page_layout.html' %}
+
+{% block content %}
+ {{super()}}
+ {% include 'owid/navigation/owid_navtabs.html' %}
+
+ <div class="container">
+ <div class="row">
+ <div class="col">
+ {% include 'owid/country/owid_country_one_pagination.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'owid/country/owid_country_one_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'owid/country/owid_country_one_pagination.html' %}
+ </div>
+ </div>
+ </div>
+{% endblock %}
+
+
+{% block footer_container %}
+
+{% endblock %}
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_test_pagination.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html
similarity index 100%
rename from src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_test_pagination.html
rename to src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany_pagination.html
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data.html
deleted file mode 100644
index 35a6df67..00000000
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_table_global_data.html
+++ /dev/null
@@ -1,38 +0,0 @@
- <table class="table table-hover table-striped table-dark">
- <thead class="table-secondary">
- <tr>
- <th scope="col">
- <a href="{{ url_for( 'owid.url_owid_date_reported_all') }}">
- date reported
- </a>
- </th>
- <th scope="col">
- deaths new
- </th>
- <th scope="col">
- cases new
- </th>
- <th scope="col">
- deaths cumulative
- </th>
- <th scope="col">
- cases cumulative
- </th>
- </tr>
- </thead>
- <tbody>
- {% for who_global_data in page_data.items %}
- <tr>
- <th>
- <a href="/owid/date_reported/{{ who_global_data.date_reported.id }}">
- {{ who_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>
- </tr>
- {% endfor %}
- </tbody>
- </table>
\ No newline at end of file
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_test_table.html b/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_test_table.html
deleted file mode 100644
index 0b5db3ad..00000000
--- a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_test_table.html
+++ /dev/null
@@ -1,131 +0,0 @@
- <table class="table table-hover table-striped table-dark">
- <thead>
- <tr>
- <th scope="col">iso_code</th>
- <th scope="col">continent</th>
- <th scope="col">location</th>
- <th scope="col">date</th>
- <th scope="col">total_cases</th>
- <th scope="col">new_cases</th>
- <th scope="col">new_cases_smoothed</th>
- <th scope="col">total_deaths</th>
- <th scope="col">new_deaths</th>
- <th scope="col">new_deaths_smoothed</th>
- <th scope="col">total_cases_per_million</th>
- <th scope="col">new_cases_per_million</th>
- <th scope="col">new_cases_smoothed_per_million</th>
- <th scope="col">total_deaths_per_million</th>
- <th scope="col">new_deaths_per_million</th>
- <th scope="col">new_deaths_smoothed_per_million</th>
- <th scope="col">reproduction_rate</th>
- <th scope="col">icu_patients</th>
- <th scope="col">icu_patients_per_million</th>
- <th scope="col">hosp_patients</th>
- <th scope="col">hosp_patients_per_million</th>
- <th scope="col">weekly_icu_admissions</th>
- <th scope="col">weekly_icu_admissions_per_million</th>
- <th scope="col">weekly_hosp_admissions</th>
- <th scope="col">weekly_hosp_admissions_per_million</th>
- <th scope="col">new_tests</th>
- <th scope="col">total_tests</th>
- <th scope="col">total_tests_per_thousand</th>
- <th scope="col">new_tests_per_thousand</th>
- <th scope="col">new_tests_smoothed</th>
- <th scope="col">new_tests_smoothed_per_thousand</th>
- <th scope="col">positive_rate</th>
- <th scope="col">tests_per_case</th>
- <th scope="col">tests_units</th>
- <th scope="col">total_vaccinations</th>
- <th scope="col">people_vaccinated</th>
- <th scope="col">people_fully_vaccinated</th>
- <th scope="col">new_vaccinations</th>
- <th scope="col">new_vaccinations_smoothed</th>
- <th scope="col">total_vaccinations_per_hundred</th>
- <th scope="col">people_vaccinated_per_hundred</th>
- <th scope="col">people_fully_vaccinated_per_hundred</th>
- <th scope="col">new_vaccinations_smoothed_per_million</th>
- <th scope="col">stringency_index</th>
- <th scope="col">population</th>
- <th scope="col">population_density</th>
- <th scope="col">median_age</th>
- <th scope="col">aged_65_older</th>
- <th scope="col">aged_70_older</th>
- <th scope="col">gdp_per_capita</th>
- <th scope="col">extreme_poverty</th>
- <th scope="col">cardiovasc_death_rate</th>
- <th scope="col">diabetes_prevalence</th>
- <th scope="col">female_smokers</th>
- <th scope="col">male_smokers</th>
- <th scope="col">handwashing_facilities</th>
- <th scope="col">hospital_beds_per_thousand</th>
- <th scope="col">life_expectancy</th>
- <th scope="col">human_development_index</th>
- </tr>
- </thead>
- <tbody>
- {% for owid_import in page_data.items %}
- <tr>
- <td>{{ owid_import.iso_code }}</td>
- <td>{{ owid_import.continent }}</td>
- <td>{{ owid_import.location }}</td>
- <td>{{ owid_import.date }}</td>
- <td>{{ owid_import.total_cases }}</td>
- <td>{{ owid_import.new_cases }}</td>
- <td>{{ owid_import.new_cases_smoothed }}</td>
- <td>{{ owid_import.total_deaths }}</td>
- <td>{{ owid_import.new_deaths }}</td>
- <td>{{ owid_import.new_deaths_smoothed }}</td>
- <td>{{ owid_import.total_cases_per_million }}</td>
- <td>{{ owid_import.new_cases_per_million }}</td>
- <td>{{ owid_import.new_cases_smoothed_per_million }}</td>
- <td>{{ owid_import.total_deaths_per_million }}</td>
- <td>{{ owid_import.new_deaths_per_million }}</td>
- <td>{{ owid_import.new_deaths_smoothed_per_million }}</td>
- <td>{{ owid_import.reproduction_rate }}</td>
- <td>{{ owid_import.icu_patients }}</td>
- <td>{{ owid_import.icu_patients_per_million }}</td>
- <td>{{ owid_import.hosp_patients }}</td>
- <td>{{ owid_import.hosp_patients_per_million }}</td>
- <td>{{ owid_import.weekly_icu_admissions }}</td>
- <td>{{ owid_import.weekly_icu_admissions_per_million }}</td>
- <td>{{ owid_import.weekly_hosp_admissions }}</td>
- <td>{{ owid_import.weekly_hosp_admissions_per_million }}</td>
- <td>{{ owid_import.new_tests }}</td>
- <td>{{ owid_import.total_tests }}</td>
- <td>{{ owid_import.total_tests_per_thousand }}</td>
- <td>{{ owid_import.new_tests_per_thousand }}</td>
- <td>{{ owid_import.new_tests_smoothed }}</td>
- <td>{{ owid_import.new_tests_smoothed_per_thousand }}</td>
- <td>{{ owid_import.positive_rate }}</td>
- <td>{{ owid_import.tests_per_case }}</td>
- <td>{{ owid_import.tests_units }}</td>
- <td>{{ owid_import.total_vaccinations }}</td>
- <td>{{ owid_import.people_vaccinated }}</td>
- <td>{{ owid_import.people_fully_vaccinated }}</td>
- <td>{{ owid_import.new_vaccinations }}</td>
- <td>{{ owid_import.new_vaccinations_smoothed }}</td>
- <td>{{ owid_import.total_vaccinations_per_hundred }}</td>
- <td>{{ owid_import.people_vaccinated_per_hundred }}</td>
- <td>{{ owid_import.people_fully_vaccinated_per_hundred }}</td>
- <td>{{ owid_import.new_vaccinations_smoothed_per_million }}</td>
- <td>{{ owid_import.stringency_index }}</td>
- <td>{{ owid_import.population }}</td>
- <td>{{ owid_import.population_density }}</td>
- <td>{{ owid_import.median_age }}</td>
- <td>{{ owid_import.aged_65_older }}</td>
- <td>{{ owid_import.aged_70_older }}</td>
- <td>{{ owid_import.gdp_per_capita }}</td>
- <td>{{ owid_import.extreme_poverty }}</td>
- <td>{{ owid_import.cardiovasc_death_rate }}</td>
- <td>{{ owid_import.diabetes_prevalence }}</td>
- <td>{{ owid_import.female_smokers }}</td>
- <td>{{ owid_import.male_smokers }}</td>
- <td>{{ owid_import.handwashing_facilities }}</td>
- <td>{{ owid_import.hospital_beds_per_thousand }}</td>
- <td>{{ owid_import.life_expectancy }}</td>
- <td>{{ owid_import.human_development_index }}</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
--
GitLab