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

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

# Conflicts:
#	src/covid19/blueprints/owid/owid_model_import.py
parents 18e5f98e 3d6a20da
No related branches found
No related tags found
No related merge requests found
......@@ -1149,3 +1149,8 @@ Debug*/Debug*\ Libs
/src/covid19/blueprints/owid/x.py
/src/covid19/blueprints/owid/x2.py
/src/covid19/blueprints/owid/x3.py
/.run/
/.checkmate/
/.run/
/lsp/
/src/covid19_worker/dump.rdb
......@@ -10,6 +10,10 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="{{ url_for( 'url_home') }}">Home</a>
</li>
{% include 'who/fragments/fragment_who_navbar_dropdown.html' %}
{% include 'ecdc/fragments/fragment_ecdc_navbar_dropdown.html' %}
......
......@@ -32,7 +32,7 @@
</li>
<li class="nav-item">
<a class="nav-link"
href="{{ url_for('rki_bundeslaender.url_rki_tasks') }}">
href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_tasks') }}">
RKI Bundeslaender
</a>
</li>
......
......@@ -53,9 +53,9 @@ def url_owid_tasks():
def url_owid_test(page=1):
page_info = ApplicationPage('OWID', "Test")
try:
page_data = OwidImport.get_continents()
page_data = OwidImport.get_continents(page)
except OperationalError:
flash("No data in the database.")
flash(message="No data in the database.", category="error")
page_data = None
return render_template(
'owid/owid_test.html',
......
......@@ -2,7 +2,7 @@
"_args": [
[
"@fortawesome/fontawesome-free@5.15.2",
"/home/tw/github/covid19python/src/covid19"
"D:\\github\\covid19python\\src\\covid19"
]
],
"_from": "@fortawesome/fontawesome-free@5.15.2",
......@@ -27,7 +27,7 @@
],
"_resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz",
"_spec": "5.15.2",
"_where": "/home/tw/github/covid19python/src/covid19",
"_where": "D:\\github\\covid19python\\src\\covid19",
"author": {
"name": "Dave Gandy",
"email": "dave@fontawesome.com",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment