diff --git a/src/covid19/blueprints/application/application_views.py b/src/covid19/blueprints/application/application_views.py
index a11c136201c477badfcbd90ef7bbbd6a78332b38..d13b7d8a029375da6a9f51ba25a4534ea4c627f2 100644
--- a/src/covid19/blueprints/application/application_views.py
+++ b/src/covid19/blueprints/application/application_views.py
@@ -18,7 +18,7 @@ from covid19.blueprints.rki_bundeslaender.rki_views import app_rki_bundeslaender
from covid19.blueprints.rki_landkreise.rki_views import app_rki_landkreise
from covid19.blueprints.rki_vaccination.rki_vaccination_views import app_rki_vaccination
from covid19.blueprints.who.who_views import app_who
-
+from covid19.blueprints.owid.owid_views import app_owid
app_application = Blueprint('application', __name__, template_folder='templates', url_prefix='/')
@@ -29,7 +29,7 @@ app.register_blueprint(app_rki_bundeslaender, url_prefix='/rki/bundeslaender')
app.register_blueprint(app_rki_landkreise, url_prefix='/rki/landkreise')
app.register_blueprint(app_rki_vaccination, url_prefix='/rki/vaccination')
app.register_blueprint(app_who, url_prefix='/who')
-
+app.register_blueprint(app_owid, url_prefix='/owid')
############################################################################################
#
diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py
index 6b5c90a6a75a9d287e2c56c5bf38aef054ec1fa9..4b5bf55218b6e752b3e3865440e985bad0072615 100644
--- a/src/covid19/blueprints/owid/owid_views.py
+++ b/src/covid19/blueprints/owid/owid_views.py
@@ -16,7 +16,7 @@ from covid19.blueprints.owid.owid_model_import import OwidImport
from covid19.blueprints.application.application_model_transient import ApplicationPage
-app_who = Blueprint('owid', __name__, template_folder='templates', url_prefix='/owid ')
+app_owid = Blueprint('owid', __name__, template_folder='templates', url_prefix='/owid ')
admin.add_view(ModelView(OwidImport, db.session, category="OWID"))
admin.add_view(ModelView(OwidDateReported, db.session, category="OWID"))
@@ -37,6 +37,7 @@ admin.add_view(ModelView(OwidData, db.session, category="OWID"))
# def task_owid_update_star_schema_incremental(self):
# def task_owid_update_star_schema_initial(self):
+
@celery.task(bind=True)
def task_owid_download_only(self):
logger = get_task_logger(__name__)
@@ -128,56 +129,56 @@ def task_owid_update_star_schema_initial(self):
return result
-@app_who.route('/task/download/only')
+@app_owid.route('/task/download/only')
def url_task_owid_download_only():
app.logger.info("url_who_task_download_only [start]")
who_service.run_download_only()
flash("who_service.run_download_only ok")
app.logger.info("url_who_task_download_only [done]")
- return redirect(url_for('who.url_who_tasks'))
+ return redirect(url_for('owid.url_owid_tasks'))
-@app_who.route('/task/import/only')
+@app_owid.route('/task/import/only')
def url_task_owid_import_only():
app.logger.info("url_who_update_run [start]")
task_owid_import_only.apply_async()
flash("who_service.run_update started")
flash(message="long running background task started", category="warning")
app.logger.info("url_who_update_run [done]")
- return redirect(url_for('who.url_who_tasks'))
+ return redirect(url_for('owid.url_owid_tasks'))
-@app_who.route('/task/update/dimension-tables/only')
+@app_owid.route('/task/update/dimension-tables/only')
def url_task_owid_update_dimension_tables_only():
app.logger.info("url_task_owid_update_dimension_tables_only [start]")
task_owid_update_dimension_tables_only.apply_async()
flash("task_owid_update_dimension_tables_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_owid_update_dimension_tables_only [done]")
- return redirect(url_for('who.url_who_tasks'))
+ return redirect(url_for('owid.url_owid_tasks'))
-@app_who.route('/task/update/fact-table/incremental/only')
+@app_owid.route('/task/update/fact-table/incremental/only')
def url_task_owid_update_fact_table_incremental_only():
app.logger.info("url_task_owid_update_fact_table_incremental_only [start]")
task_owid_update_fact_table_incremental_only.apply_async()
flash("task_owid_update_fact_table_incremental_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_owid_update_fact_table_incremental_only [done]")
- return redirect(url_for('who.url_who_tasks'))
+ return redirect(url_for('owid.url_owid_tasks'))
-@app_who.route('/task/update/fact-table/initial/only')
+@app_owid.route('/task/update/fact-table/initial/only')
def url_task_owid_update_fact_table_initial_only():
app.logger.info("url_task_owid_update_fact_table_initial_only [start]")
task_owid_update_fact_table_initial_only.apply_async()
flash("task_owid_update_fact_table_initial_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_who_task_update_full [done]")
- return redirect(url_for('who.url_who_tasks'))
+ return redirect(url_for('owid.url_owid_tasks'))
-@app_who.route('/task/update/star_schema/initial')
+@app_owid.route('/task/update/star_schema/initial')
def url_task_owid_update_star_schema_initial():
app.logger.info("url_who_task_update_full [start]")
who_service.run_download_only()
@@ -186,10 +187,10 @@ def url_task_owid_update_star_schema_initial():
flash("task_owid_update_star_schema_initial started")
flash(message="long running background task started", category="warning")
app.logger.info("url_who_task_update_full [done]")
- return redirect(url_for('who.url_who_tasks'))
+ return redirect(url_for('owid.url_owid_tasks'))
-@app_who.route('/task/update/star_schema/incremental')
+@app_owid.route('/task/update/star_schema/incremental')
def url_task_owid_update_star_schema_incremental():
app.logger.info("url_task_owid_update_star_schema_incremental [start]")
who_service.run_download_only()
@@ -198,58 +199,58 @@ def url_task_owid_update_star_schema_incremental():
flash("task_owid_run_update_full started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_owid_update_star_schema_incremental [done]")
- return redirect(url_for('who.url_who_tasks'))
+ return redirect(url_for('owid.url_owid_tasks'))
-@app_who.route('/info')
-def url_who_info():
- page_info = ApplicationPage('WHO', "Info")
+@app_owid.route('/info')
+def url_owid_info():
+ page_info = ApplicationPage('OWID',"Info")
return render_template(
- 'who/who_info.html',
+ 'owid/owid_info.html',
page_info=page_info)
-@app_who.route('/tasks')
-def url_who_tasks():
- page_info = ApplicationPage('WHO', "Tasks")
+@app_owid.route('/tasks')
+def url_owid_tasks():
+ page_info = ApplicationPage('OWID',"Tasks")
return render_template(
- 'who/who_tasks.html',
+ 'owid/owid_tasks.html',
page_info=page_info)
-@app_who.route('/imported/page/<int:page>')
-@app_who.route('/imported')
-def url_who_imported(page=1):
- page_info = ApplicationPage('WHO', "Last Import")
+@app_owid.route('/imported/page/<int:page>')
+@app_owid.route('/imported')
+def url_owid_imported(page=1):
+ page_info = ApplicationPage('OWID',"Last Import")
try:
page_data = OwidImport.get_all_as_page(page)
except OperationalError:
flash("No data in the database.")
page_data = None
return render_template(
- 'who/who_imported.html',
+ 'owid/owid_imported.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/date_reported/all/page/<int:page>')
-@app_who.route('/date_reported/all')
-def url_who_date_reported_all(page: int = 1):
- page_info = ApplicationPage('WHO', "Date Reported", "All")
+@app_owid.route('/date_reported/all/page/<int:page>')
+@app_owid.route('/date_reported/all')
+def url_owid_date_reported_all(page: int = 1):
+ page_info = ApplicationPage('OWID',"Date Reported", "All")
try:
page_data = OwidDateReported.get_all_as_page(page)
except OperationalError:
flash("No regions in the database.")
page_data = None
return render_template(
- 'who/date_reported/who_date_reported_all.html',
+ 'owid/date_reported/owid_date_reported_all.html',
page_data=page_data,
page_info=page_info)
-@app_who.route('/date_reported/<int:date_reported_id>/page/<int:page>')
-@app_who.route('/date_reported/<int:date_reported_id>')
-def url_who_date_reported(date_reported_id: int, page: int = 1):
+@app_owid.route('/date_reported/<int:date_reported_id>/page/<int:page>')
+@app_owid.route('/date_reported/<int:date_reported_id>')
+def url_owid_date_reported(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
@@ -262,15 +263,15 @@ 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=date_reported,
+ 'owid/date_reported/owid_date_reported_one.html',
+ owid_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/date_reported/<int:date_reported_id>/cases_new/page/<int:page>')
-@app_who.route('/date_reported/<int:date_reported_id>/cases_new')
-def url_who_date_reported_cases_new(date_reported_id: int, page: int = 1):
+@app_owid.route('/date_reported/<int:date_reported_id>/cases_new/page/<int:page>')
+@app_owid.route('/date_reported/<int:date_reported_id>/cases_new')
+def url_owid_date_reported_cases_new(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
@@ -283,15 +284,15 @@ 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=date_reported,
+ 'owid/date_reported/owid_date_reported_one_cases_new.html',
+ owid_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/date_reported/<int:date_reported_id>/cases_cumulative/page/<int:page>')
-@app_who.route('/date_reported/<int:date_reported_id>/cases_cumulative')
-def url_who_date_reported_cases_cumulative(date_reported_id: int, page: int = 1):
+@app_owid.route('/date_reported/<int:date_reported_id>/cases_cumulative/page/<int:page>')
+@app_owid.route('/date_reported/<int:date_reported_id>/cases_cumulative')
+def url_owid_date_reported_cases_cumulative(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
@@ -304,15 +305,15 @@ 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=date_reported,
+ 'owid/date_reported/owid_date_reported_one_cases_cumulative.html',
+ owid_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/date_reported/<int:date_reported_id>/deaths_new/page/<int:page>')
-@app_who.route('/date_reported/<int:date_reported_id>/deaths_new')
-def url_who_date_reported_deaths_new(date_reported_id: int, page: int = 1):
+@app_owid.route('/date_reported/<int:date_reported_id>/deaths_new/page/<int:page>')
+@app_owid.route('/date_reported/<int:date_reported_id>/deaths_new')
+def url_owid_date_reported_deaths_new(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
@@ -325,15 +326,15 @@ 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=date_reported,
+ 'owid/date_reported/owid_date_reported_one_deaths_new.html',
+ owid_date_reported=date_reported,
page_data=page_data,
page_info=page_info)
-@app_who.route('/date_reported/<int:date_reported_id>/deaths_cumulative/page/<int:page>')
-@app_who.route('/date_reported/<int:date_reported_id>/deaths_cumulative')
-def url_who_date_reported_deaths_cumulative(date_reported_id: int, page: int = 1):
+@app_owid.route('/date_reported/<int:date_reported_id>/deaths_cumulative/page/<int:page>')
+@app_owid.route('/date_reported/<int:date_reported_id>/deaths_cumulative')
+def url_owid_date_reported_deaths_cumulative(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
page_info = ApplicationPage(
"Date Reported: " + date_reported.date_reported,
@@ -346,7 +347,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=date_reported,
+ 'owid/date_reported/owid_date_reported_one_deaths_cumulative.html',
+ owid_date_reported=date_reported,
page_data=page_data,
page_info=page_info)