Skip to content
Snippets Groups Projects
Commit d85529ce authored by thomaswoehlke's avatar thomaswoehlke
Browse files

Merge remote-tracking branch 'origin/main' into main

parents 0cf18874 ea5e1d56
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
templates/europe/europe_continent.html
+ 84
− 0
View file @ d85529ce
{% extends 'layout.html' %}
{% block navigation_breadcrumb %}
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/">Home</a></li>
<li class="breadcrumb-item"><a href="/who/region/all">Regions</a></li>
<li class="breadcrumb-item active" aria-current="page">TBD</li>
</ol>
</nav>
{% endblock %}
{% block navigation_navtabs %}
{% include 'fragment_navtabs_europe.html' %}
{% endblock %}
{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_continent', page=page_data.prev_num) }}">
Previous
</a>
</li>
{% endif %}
{% for page_num in page_data.iter_pages() %}
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_continent', page=page_num) }}">
{{ page_num }}
</a>
</li>
{% else %}
<li class="page-item active">
<a class="page-link" href="#">{{ page_num }}</a>
</li>
{% endif %}
{% else %}
<li class="page-item">
<span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
</li>
{% endif %}
{% endfor %}
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_continent', page=page_data.next_num) }}">
Next
</a>
</li>
{% endif %}
</ul>
{% endif %}
<table class="table table-hover table-striped">
<thead>
<tr>
<th scope="col">continent</th>
</tr>
</thead>
<tbody>
{% for europe_continent in page_data.items %}
<tr>
<td>{{ europe_continent.continent_exp }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}
{% block footer_container %}
<div>
{% for error in errors %}
<h4>{{ error }}</h4>
{% endfor %}
</div>
{% endblock %}
\ No newline at end of file
templates/europe/europe_country.html
+ 92
− 0
View file @ d85529ce
{% extends 'layout.html' %}
{% block navigation_breadcrumb %}
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/">Home</a></li>
<li class="breadcrumb-item"><a href="/who/region/all">Regions</a></li>
<li class="breadcrumb-item active" aria-current="page">TBD</li>
</ol>
</nav>
{% endblock %}
{% block navigation_navtabs %}
{% include 'fragment_navtabs_europe.html' %}
{% endblock %}
{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_country', page=page_data.prev_num) }}">
Previous
</a>
</li>
{% endif %}
{% for page_num in page_data.iter_pages() %}
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_country', page=page_num) }}">
{{ page_num }}
</a>
</li>
{% else %}
<li class="page-item active">
<a class="page-link" href="#">{{ page_num }}</a>
</li>
{% endif %}
{% else %}
<li class="page-item">
<span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
</li>
{% endif %}
{% endfor %}
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_country', page=page_data.next_num) }}">
Next
</a>
</li>
{% endif %}
</ul>
{% endif %}
<table class="table table-hover table-striped">
<thead>
<tr>
<th scope="col">countries_and_territories</th>
<th scope="col">pop_data_2019</th>
<th scope="col">geo_id</th>
<th scope="col">country_territory_code</th>
<th scope="col">continent</th>
</tr>
</thead>
<tbody>
{% for europe_country in page_data.items %}
<tr>
<td>{{ europe_country.countries_and_territories }}</td>
<td>{{ europe_country.pop_data_2019 }}</td>
<td>{{ europe_country.geo_id }}</td>
<td>{{ europe_country.country_territory_code }}</td>
<td>{{ europe_country.continent.continent_exp }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}
{% block footer_container %}
<div>
{% for error in errors %}
<h4>{{ error }}</h4>
{% endfor %}
</div>
{% endblock %}
\ No newline at end of file
templates/europe/europe_data.html
+ 102
− 0
View file @ d85529ce
{% extends 'layout.html' %}
{% block navigation_breadcrumb %}
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="/">Home</a></li>
<li class="breadcrumb-item"><a href="/who/region/all">Regions</a></li>
<li class="breadcrumb-item active" aria-current="page">TBD</li>
</ol>
</nav>
{% endblock %}
{% block navigation_navtabs %}
{% include 'fragment_navtabs_europe.html' %}
{% endblock %}
{% block main_container %}
{% if page_data.pages > 1 %}
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_data', page=page_data.prev_num) }}">
Previous
</a>
</li>
{% endif %}
{% for page_num in page_data.iter_pages() %}
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_data', page=page_num) }}">
{{ page_num }}
</a>
</li>
{% else %}
<li class="page-item active">
<a class="page-link" href="#">{{ page_num }}</a>
</li>
{% endif %}
{% else %}
<li class="page-item">
<span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
</li>
{% endif %}
{% endfor %}
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
href="{{ url_for( 'url_europe_data', page=page_data.next_num) }}">
Next
</a>
</li>
{% endif %}
</ul>
{% endif %}
<table class="table table-hover table-striped">
<thead>
<tr>
<th scope="col">date_rep</th>
<th scope="col">year_week</th>
<th scope="col">deaths_weekly</th>
<th scope="col">cases_weekly</th>
<th scope="col">notification_rate_per_100000_population_14days</th>
<th scope="col">countries_and_territories</th>
<th scope="col">pop_data_2019</th>
<th scope="col">geo_id</th>
<th scope="col">country_territory_code</th>
<th scope="col">continent</th>
</tr>
</thead>
<tbody>
{% for europe_data in page_data.items %}
<tr>
<td>{{ europe_data.europe_date_reported.date_rep }}</td>
<td>{{ europe_data.europe_date_reported.year_week }}</td>
<td>{{ europe_data.deaths_weekly }}</td>
<td>{{ europe_data.cases_weekly }}</td>
<td>{{ europe_data.notification_rate_per_100000_population_14days }}</td>
<td>{{ europe_data.europe_country.countries_and_territories }}</td>
<td>{{ europe_data.europe_country.pop_data_2019 }}</td>
<td>{{ europe_data.europe_country.geo_id }}</td>
<td>{{ europe_data.europe_country.country_territory_code }}</td>
<td>{{ europe_data.europe_country.continent.continent_exp }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% endblock %}
{% block footer_container %}
<div>
{% for error in errors %}
<h4>{{ error }}</h4>
{% endfor %}
</div>
{% endblock %}
\ No newline at end of file
templates/fragment_navtabs_europe.html
+ 12
− 0
View file @ d85529ce
......@@ -12,5 +12,17 @@
<li class="nav-item">
<a class="nav-link" href="/europe/imported">Europe imported</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/europe/date_reported">Europe date_reported</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/europe/continent">Europe continent</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/europe/country">Europe country</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/europe/data">Europe data</a>
</li>
</ul>
</nav>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment