diff --git a/src/flask_covid19/__init__.py b/src/flask_covid19/__init__.py
index c5d92f1df191bc9d4d3e132593b8f55308336ddf..cd420f1a862ecac0dd833d1323e7c03e3bebd858 100644
--- a/src/flask_covid19/__init__.py
+++ b/src/flask_covid19/__init__.py
@@ -1,7 +1,6 @@
from database import app, run_run_with_debug, port, db
-import flask_covid19.blueprints.app_web.application_views
-from flask_covid19.blueprints.app_all.all_services import app_user_service
+from flask_covid19.blueprints.app_web.all_services import app_user_service
from flask_covid19.blueprints.app_web.application_service import ApplicationService
diff --git a/src/flask_covid19/blueprints/app_admin/app_admin_views.py b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
index 80e9ef2499c396ce08b62ed184ffdcf44a9d9149..914b04845b2416962723f641b33770771a2871b8 100644
--- a/src/flask_covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
@@ -3,9 +3,9 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-from flask_covid19.blueprints.app_all.all_services import app_admin_service
+from flask_covid19.blueprints.app_web.all_services import app_admin_service
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
drop_and_create_data_again = True
@@ -18,7 +18,7 @@ blueprint_app_admin = Blueprint('app_admin', __name__, template_folder='template
@blueprint_app_admin.route('/')
def url_admin_index():
- page_info = ApplicationPage('Admin', "Covid19 Admin")
+ page_info = WebPageContent('Admin', "Covid19 Admin")
return render_template(
'app_admin/index.html',
page_info=page_info)
@@ -26,7 +26,7 @@ def url_admin_index():
@blueprint_app_admin.route('/tasks')
def url_admin_tasks():
- page_info = ApplicationPage('Admin', "Admin Tasks")
+ page_info = WebPageContent('Admin', "Admin Tasks")
return render_template(
'app_admin/admin_tasks.html',
page_info=page_info)
@@ -34,7 +34,7 @@ def url_admin_tasks():
@blueprint_app_admin.route('/info')
def url_admin_info():
- page_info = ApplicationPage('Admin', "Info")
+ page_info = WebPageContent('Admin', "Info")
return render_template(
'app_admin/admin_info.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py
index eb11873defeffb999b6b45ee1ecafdf755f3ef1a..955038a7c8b91f7717d347e1e4da88173236679d 100644
--- a/src/flask_covid19/blueprints/app_all/all_views.py
+++ b/src/flask_covid19/blueprints/app_all/all_views.py
@@ -3,9 +3,9 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-from flask_covid19.blueprints.app_all.all_services import app_admin_service, all_service
+from flask_covid19.blueprints.app_web.all_services import app_admin_service, all_service
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
drop_and_create_data_again = True
@@ -19,7 +19,7 @@ blueprint_app_all = Blueprint('app_all', __name__, template_folder='templates',
@blueprint_app_all.route('/tasks')
def url_all_tasks():
- page_info = ApplicationPage('All', "Tasks")
+ page_info = WebPageContent('All', "Tasks")
return render_template(
'app_all/app_all_tasks.html',
page_info=page_info)
@@ -27,7 +27,7 @@ def url_all_tasks():
@blueprint_app_all.route('/info')
def url_all_info():
- page_info = ApplicationPage('All', "Info")
+ page_info = WebPageContent('All', "Info")
return render_template(
'app_all/app_all_info.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/app_user/user_views.py b/src/flask_covid19/blueprints/app_user/user_views.py
index 25254e332f7ef4033f524ad5774fca3d998c76ef..f02427c93610717a42a90cc6034bf257a8470d63 100644
--- a/src/flask_covid19/blueprints/app_user/user_views.py
+++ b/src/flask_covid19/blueprints/app_user/user_views.py
@@ -9,7 +9,7 @@ import flask
from database import admin, db, login_manager
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.app_user.user_model import User, LoginForm
@@ -25,7 +25,7 @@ admin.add_view(ModelView(User, db.session, category="USR"))
@blueprint_app_user.route('/login', methods=['GET'])
def login_form():
- page_info = ApplicationPage('usr', "Login")
+ page_info = WebPageContent('usr', "Login")
if current_user.is_authenticated:
return redirect(url_for('usr.profile'))
form = LoginForm()
@@ -34,7 +34,7 @@ def login_form():
@blueprint_app_user.route('/login', methods=['POST'])
def login():
- page_info = ApplicationPage('USR', "Login")
+ page_info = WebPageContent('USR', "Login")
if current_user.is_authenticated:
return redirect(url_for('usr.profile'))
form = LoginForm()
@@ -51,7 +51,7 @@ def login():
@blueprint_app_user.route("/profile")
@login_required
def profile():
- page_info = ApplicationPage('USR', "profile")
+ page_info = WebPageContent('USR', "profile")
return flask.render_template('usr/profile.html', page_info=page_info)
@@ -80,7 +80,7 @@ def unauthorized():
@blueprint_app_user.route('/info/page/<int:page>')
@blueprint_app_user.route('/info')
def url_user_info(page=1):
- page_info = ApplicationPage('USR', "Info")
+ page_info = WebPageContent('USR', "Info")
try:
page_data = User.get_all_as_page(page)
except OperationalError:
@@ -94,7 +94,7 @@ def url_user_info(page=1):
@blueprint_app_user.route('/tasks')
def url_user_tasks():
- page_info = ApplicationPage('USR', "Tasks")
+ page_info = WebPageContent('USR', "Tasks")
return render_template(
'usr/user_tasks.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/app_web/application_model_transient.py b/src/flask_covid19/blueprints/app_web/web_model_transient.py
similarity index 96%
rename from src/flask_covid19/blueprints/app_web/application_model_transient.py
rename to src/flask_covid19/blueprints/app_web/web_model_transient.py
index ad815f9310fb8c87974833448129518b69d1b66f..8b6eca67cc0978d873924fa0c2553e85eacfcfe3 100644
--- a/src/flask_covid19/blueprints/app_web/application_model_transient.py
+++ b/src/flask_covid19/blueprints/app_web/web_model_transient.py
@@ -1,4 +1,4 @@
-class ApplicationPage:
+class WebPageContent:
def __init__(self, default_title, default_subtitle=None, default_subtitle_info=None):
self.title = default_title
diff --git a/src/flask_covid19/blueprints/app_web/application_service.py b/src/flask_covid19/blueprints/app_web/web_service.py
similarity index 98%
rename from src/flask_covid19/blueprints/app_web/application_service.py
rename to src/flask_covid19/blueprints/app_web/web_service.py
index 17b5b6763fa37016cddb539bf9482fa1b0118d20..8fb689617813a086a4b02724876b9a134a91f2b5 100644
--- a/src/flask_covid19/blueprints/app_web/application_service.py
+++ b/src/flask_covid19/blueprints/app_web/web_service.py
@@ -1,7 +1,7 @@
from database import app
-class ApplicationService:
+class WebService:
def __init__(self, database, user_service):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Application Service [init]")
diff --git a/src/flask_covid19/blueprints/app_all/all_services.py b/src/flask_covid19/blueprints/app_web/web_services.py
similarity index 100%
rename from src/flask_covid19/blueprints/app_all/all_services.py
rename to src/flask_covid19/blueprints/app_web/web_services.py
diff --git a/src/flask_covid19/blueprints/app_web/application_views.py b/src/flask_covid19/blueprints/app_web/web_views.py
similarity index 94%
rename from src/flask_covid19/blueprints/app_web/application_views.py
rename to src/flask_covid19/blueprints/app_web/web_views.py
index 3a9b7667bdb692de90abe0fe62b8f8442818db0e..79e97f182c119df3d96e7afba7e748c58fb748aa 100644
--- a/src/flask_covid19/blueprints/app_web/application_views.py
+++ b/src/flask_covid19/blueprints/app_web/web_views.py
@@ -1,7 +1,7 @@
from flask import render_template, redirect, url_for, Blueprint
from database import app
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.app_user.user_views import blueprint_app_user
@@ -49,7 +49,7 @@ app.register_blueprint(app_divi_test, url_prefix='/divi/test')
#
@app.route('/home')
def url_home():
- page_info = ApplicationPage('Home', "Covid19 Data")
+ page_info = WebPageContent('Home', "Covid19 Data")
return render_template(
'app_application/page_home.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/divi/divi_test_views.py b/src/flask_covid19/blueprints/divi/divi_test_views.py
index 4f2f3eff570a62e33e8ffa8cedef2e85adfdaf1a..3e7a1c9248e8d4d17e3d7bb4bd0d36e3d9b85a53 100644
--- a/src/flask_covid19/blueprints/divi/divi_test_views.py
+++ b/src/flask_covid19/blueprints/divi/divi_test_views.py
@@ -5,12 +5,12 @@ from flask_login import login_required
from database import app, db
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.divi.divi_model_import import DiviImport
from flask_covid19.blueprints.divi.divi_model import DiviData
-from flask_covid19.blueprints.app_all.all_services import divi_service
+from flask_covid19.blueprints.app_web.all_services import divi_service
from flask_covid19.blueprints.divi.divi_test_service import DiviTestService
divi_test_service = DiviTestService(db, divi_service)
@@ -25,7 +25,7 @@ app_divi_test = Blueprint('divi_test', __name__, template_folder='templates', ur
@app_divi_test.route('/tests')
@login_required
def url_divi_test_tests():
- page_info = ApplicationPage('DIVI', "Tests")
+ page_info = WebPageContent('DIVI', "Tests")
return render_template(
'divi_test/divi_tests.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/divi/divi_views.py b/src/flask_covid19/blueprints/divi/divi_views.py
index 68e569bee9350a85de68198ccb0aaa3b434e0808..0267a287c16410ad44ff035c9859ea2995b74ae4 100644
--- a/src/flask_covid19/blueprints/divi/divi_views.py
+++ b/src/flask_covid19/blueprints/divi/divi_views.py
@@ -7,9 +7,9 @@ from flask_login import login_required
from database import app, admin, db
-from flask_covid19.blueprints.app_all.all_services import divi_service
+from flask_covid19.blueprints.app_web.all_services import divi_service
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.divi.divi_model import DiviRegion, DiviDateReported, DiviCountry, DiviData
from flask_covid19.blueprints.divi.divi_model_import import DiviImport
@@ -31,7 +31,7 @@ admin.add_view(ModelView(DiviData, db.session, category="DIVI"))
@app_divi.route('/info')
def url_divi_info():
- page_info = ApplicationPage('divi', "Info")
+ page_info = WebPageContent('divi', "Info")
return render_template(
'divi/divi_info.html',
page_info=page_info)
@@ -40,7 +40,7 @@ def url_divi_info():
@app_divi.route('/tasks')
@login_required
def url_divi_tasks():
- page_info = ApplicationPage('divi', "Tasks")
+ page_info = WebPageContent('divi', "Tasks")
return render_template(
'divi/divi_tasks.html',
page_info=page_info)
@@ -50,7 +50,7 @@ def url_divi_tasks():
@app_divi.route('/imported')
@login_required
def url_divi_imported(page=1):
- page_info = ApplicationPage('divi', "Last Import")
+ page_info = WebPageContent('divi', "Last Import")
try:
page_data = DiviImport.get_all_as_page(page)
except OperationalError:
@@ -65,7 +65,7 @@ def url_divi_imported(page=1):
@app_divi.route('/date_reported/all/page/<int:page>')
@app_divi.route('/date_reported/all')
def url_divi_date_reported_all(page: int = 1):
- page_info = ApplicationPage('divi', "Date Reported", "All")
+ page_info = WebPageContent('divi', "Date Reported", "All")
try:
page_data = DiviDateReported.get_all_as_page(page)
except OperationalError:
@@ -81,7 +81,7 @@ def url_divi_date_reported_all(page: int = 1):
@app_divi.route('/date_reported/<int:date_reported_id>')
def url_divi_date_reported(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'divi',
"data of all reported countries for divi date reported " + date_reported.date_reported + " "
@@ -102,7 +102,7 @@ def url_divi_date_reported(date_reported_id: int, page: int = 1):
@app_divi.route('/date_reported/<int:date_reported_id>/cases_new')
def url_divi_date_reported_cases_new(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'divi',
"data of all reported countries for divi date reported " + date_reported.date_reported + " "
@@ -123,7 +123,7 @@ def url_divi_date_reported_cases_new(date_reported_id: int, page: int = 1):
@app_divi.route('/date_reported/<int:date_reported_id>/cases_cumulative')
def url_divi_date_reported_cases_cumulative(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'divi',
"data of all reported countries for divi date reported " + date_reported.date_reported + " "
@@ -144,7 +144,7 @@ def url_divi_date_reported_cases_cumulative(date_reported_id: int, page: int = 1
@app_divi.route('/date_reported/<int:date_reported_id>/deaths_new')
def url_divi_date_reported_deaths_new(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'divi',
"data of all reported countries for divi date reported " + date_reported.date_reported + " "
@@ -165,7 +165,7 @@ def url_divi_date_reported_deaths_new(date_reported_id: int, page: int = 1):
@app_divi.route('/date_reported/<int:date_reported_id>/deaths_cumulative')
def url_divi_date_reported_deaths_cumulative(date_reported_id: int, page: int = 1):
date_reported = DiviDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'divi',
"data of all reported countries for divi date reported " + date_reported.date_reported + " "
@@ -185,7 +185,7 @@ def url_divi_date_reported_deaths_cumulative(date_reported_id: int, page: int =
@app_divi.route('/region/all/page/<int:page>')
@app_divi.route('/region/all')
def url_divi_region_all(page: int = 1):
- page_info = ApplicationPage('divi', "Region", "All")
+ page_info = WebPageContent('divi', "Region", "All")
try:
page_data = DiviRegion.get_all_as_page(page)
except OperationalError:
@@ -201,7 +201,7 @@ def url_divi_region_all(page: int = 1):
@app_divi.route('/region/<int:region_id>')
def url_divi_region(region_id: int, page: int = 1):
divi_region = None
- page_info = ApplicationPage("Countries", "divi Region")
+ page_info = WebPageContent("Countries", "divi Region")
try:
divi_region = DiviRegion.get_by_id(region_id)
page_data = DiviCountry.get_divi_countries_for_region(divi_region, page)
@@ -221,7 +221,7 @@ def url_divi_region(region_id: int, page: int = 1):
@app_divi.route('/country/all/page/<int:page>')
@app_divi.route('/country/all')
def url_divi_country_all(page: int = 1):
- page_info = ApplicationPage('divi', "Countries", "All")
+ page_info = WebPageContent('divi', "Countries", "All")
try:
page_data = DiviCountry.get_all_as_page(page)
except OperationalError:
@@ -238,9 +238,9 @@ def url_divi_country_all(page: int = 1):
def url_divi_country(country_id: int, page: int = 1):
divi_country = DiviCountry.get_by_id(country_id)
page_data = DiviData.get_data_for_country(divi_country, page)
- page_info = ApplicationPage(divi_country.country,
- "Country "+divi_country.country_code,
- "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
+ page_info = WebPageContent(divi_country.country,
+ "Country " + divi_country.country_code,
+ "Data per Day in Country " + divi_country.country +" of divi Region " + divi_country.region.region)
return render_template(
'divi/country/divi_country_one.html',
divi_country=divi_country,
@@ -253,9 +253,9 @@ def url_divi_country(country_id: int, page: int = 1):
def url_divi_country_cases_new(country_id: int, page: int = 1):
divi_country = DiviCountry.get_by_id(country_id)
page_data = DiviData.get_data_for_country_order_by_cases_new(divi_country, page)
- page_info = ApplicationPage(divi_country.country,
- "Country "+divi_country.country_code,
- "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
+ page_info = WebPageContent(divi_country.country,
+ "Country " + divi_country.country_code,
+ "Data per Day in Country " + divi_country.country +" of divi Region " + divi_country.region.region)
return render_template(
'divi/country/divi_country_one_cases_new.html',
divi_country=divi_country,
@@ -268,9 +268,9 @@ def url_divi_country_cases_new(country_id: int, page: int = 1):
def url_divi_country_cases_cumulative(country_id: int, page: int = 1):
divi_country = DiviCountry.get_by_id(country_id)
page_data = DiviData.get_data_for_country_order_by_cases_cumulative(divi_country, page)
- page_info = ApplicationPage(divi_country.country,
- "Country "+divi_country.country_code,
- "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
+ page_info = WebPageContent(divi_country.country,
+ "Country " + divi_country.country_code,
+ "Data per Day in Country " + divi_country.country +" of divi Region " + divi_country.region.region)
return render_template(
'divi/country/divi_country_one_cases_cumulative.html',
divi_country=divi_country,
@@ -283,9 +283,9 @@ def url_divi_country_cases_cumulative(country_id: int, page: int = 1):
def url_divi_country_deaths_new(country_id: int, page: int = 1):
divi_country = DiviCountry.get_by_id(country_id)
page_data = DiviData.get_data_for_country_order_by_deaths_new(divi_country, page)
- page_info = ApplicationPage(divi_country.country,
- "Country "+divi_country.country_code,
- "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
+ page_info = WebPageContent(divi_country.country,
+ "Country " + divi_country.country_code,
+ "Data per Day in Country " + divi_country.country +" of divi Region " + divi_country.region.region)
return render_template(
'divi/country/divi_country_one_deaths_new.html',
divi_country=divi_country,
@@ -298,9 +298,9 @@ def url_divi_country_deaths_new(country_id: int, page: int = 1):
def url_divi_country_deaths_cumulative(country_id: int, page: int = 1):
divi_country = DiviCountry.get_by_id(country_id)
page_data = DiviData.get_data_for_country_order_by_deaths_cumulative(divi_country, page)
- page_info = ApplicationPage(divi_country.country,
- "Country "+divi_country.country_code,
- "Data per Day in Country "+divi_country.country+" of divi Region "+divi_country.region.region)
+ page_info = WebPageContent(divi_country.country,
+ "Country " + divi_country.country_code,
+ "Data per Day in Country " + divi_country.country +" of divi Region " + divi_country.region.region)
return render_template(
'divi/country/divi_country_one_deaths_cumulative.html',
divi_country=divi_country,
@@ -311,7 +311,7 @@ def url_divi_country_deaths_cumulative(country_id: int, page: int = 1):
@app_divi.route('/germany/page/<int:page>')
@app_divi.route('/germany')
def url_divi_germany(page: int = 1):
- page_info = ApplicationPage('divi', "Germany")
+ page_info = WebPageContent('divi', "Germany")
divi_country_germany = DiviCountry.get_germany()
if divi_country_germany is None:
flash('country: Germany not found in Database', category='error')
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py
index 5b5784bdf451b04f43f765e3416312fc6c81d976..5a3f81aafd0ff284d13aefc6a6c2b74064d4f6ba 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_test_views.py
@@ -4,9 +4,9 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from flask_covid19.blueprints.app_all.all_services import ecdc_service
+from flask_covid19.blueprints.app_web.all_services import ecdc_service
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
from flask_covid19.blueprints.ecdc.ecdc_test_service import EcdcTestService
@@ -23,7 +23,7 @@ app_ecdc_test = Blueprint('ecdc_test', __name__, template_folder='templates', ur
@app_ecdc_test.route('/tests')
@login_required
def url_ecdc_test_tests():
- page_info = ApplicationPage('ECDC', "Tests")
+ page_info = WebPageContent('ECDC', "Tests")
return render_template(
'ecdc_test/ecdc_tests.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
index 181ea7c0a043c7889ae1ab683e28c62161065138..51c5aa28fb54297b05ed50c28913573a859a6627 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
@@ -4,12 +4,12 @@ from celery.utils.log import get_task_logger
from flask_admin.contrib.sqla import ModelView
from database import admin, db
-from flask_covid19.blueprints.app_all.all_services import ecdc_service
+from flask_covid19.blueprints.app_web.all_services import ecdc_service
from flask_covid19.blueprints.app_mq.application_workers import mq
from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
from flask_covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
app_ecdc = Blueprint('ecdc', __name__, template_folder='templates', url_prefix='/ecdc')
@@ -27,7 +27,7 @@ admin.add_view(ModelView(EcdcData, db.session, category="ECDC"))
@app_ecdc.route('/info')
def url_ecdc_info():
- page_info = ApplicationPage('Europe', "Info")
+ page_info = WebPageContent('Europe', "Info")
return render_template(
'ecdc/ecdc_info.html',
title='Europe',
@@ -36,7 +36,7 @@ def url_ecdc_info():
@app_ecdc.route('/tasks')
def url_ecdc_tasks():
- page_info = ApplicationPage('Europe', "Tasks")
+ page_info = WebPageContent('Europe', "Tasks")
return render_template(
'ecdc/ecdc_tasks.html',
title='Europe Tasks',
@@ -46,7 +46,7 @@ def url_ecdc_tasks():
@app_ecdc.route('/imported/page/<int:page>')
@app_ecdc.route('/imported')
def url_ecdc_data_imported(page=1):
- page_info = ApplicationPage('Europe', "Last Import")
+ page_info = WebPageContent('Europe', "Last Import")
page_data = EcdcImport.get_all_as_page(page)
return render_template(
'ecdc/imported/ecdc_imported.html',
@@ -57,7 +57,7 @@ def url_ecdc_data_imported(page=1):
@app_ecdc.route('/date_reported/all/page/<int:page>')
@app_ecdc.route('/date_reported/all')
def url_ecdc_date_reported_all(page=1):
- page_info = ApplicationPage('Europe', "date_reported")
+ page_info = WebPageContent('Europe', "date_reported")
page_data = EcdcDateReported.get_all_as_page(page)
return render_template(
'ecdc/date_reported/ecdc_date_reported_all.html',
@@ -70,7 +70,7 @@ def url_ecdc_date_reported_all(page=1):
@app_ecdc.route('/date_reported/notification_rate/<int:europe_date_reported_id>/page/<int:page>')
@app_ecdc.route('/date_reported/notification_rate/<int:europe_date_reported_id>')
def url_ecdc_date_reported_one_notification_rate(europe_date_reported_id, page=1):
- page_info = ApplicationPage('Europe', "date_reported")
+ page_info = WebPageContent('Europe', "date_reported")
europe_date_reported = EcdcDateReported.get_by_id(europe_date_reported_id)
page_data = EcdcData.find_by_date_reported_notification_rate(europe_date_reported, page)
return render_template(
@@ -83,7 +83,7 @@ def url_ecdc_date_reported_one_notification_rate(europe_date_reported_id, page=1
@app_ecdc.route('/date_reported/deaths_weekly/<int:europe_date_reported_id>/page/<int:page>')
@app_ecdc.route('/date_reported/deaths_weekly/<int:europe_date_reported_id>')
def url_ecdc_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
- page_info = ApplicationPage('Europe', "date_reported")
+ page_info = WebPageContent('Europe', "date_reported")
europe_date_reported = EcdcDateReported.get_by_id(europe_date_reported_id)
page_data = EcdcData.find_by_date_reported_deaths_weekly(europe_date_reported, page)
return render_template(
@@ -96,7 +96,7 @@ def url_ecdc_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
@app_ecdc.route('/date_reported/cases_weekly/<int:europe_date_reported_id>/page/<int:page>')
@app_ecdc.route('/date_reported/cases_weekly/<int:europe_date_reported_id>')
def url_ecdc_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
- page_info = ApplicationPage('Europe', "date_reported")
+ page_info = WebPageContent('Europe', "date_reported")
europe_date_reported = EcdcDateReported.get_by_id(europe_date_reported_id)
page_data = EcdcData.find_by_date_reported_cases_weekly(europe_date_reported, page)
return render_template(
@@ -109,7 +109,7 @@ def url_ecdc_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
@app_ecdc.route('/continent/all/page/<int:page>')
@app_ecdc.route('/continent/all')
def url_ecdc_continent_all(page=1):
- page_info = ApplicationPage('Europe', "continent")
+ page_info = WebPageContent('Europe', "continent")
page_data = EcdcContinent.get_all_as_page(page)
return render_template(
'ecdc/continent/ecdc_continent_all.html',
@@ -120,7 +120,7 @@ def url_ecdc_continent_all(page=1):
@app_ecdc.route('/continent/<int:continent_id>/page/<int:page>')
@app_ecdc.route('/continent/<int:continent_id>')
def url_ecdc_continent_one(continent_id, page=1):
- page_info = ApplicationPage('Europe', "continent")
+ page_info = WebPageContent('Europe', "continent")
continent = EcdcContinent.get_by_id(continent_id)
page_data = EcdcCountry.find_by_continent(continent, page)
return render_template(
@@ -133,7 +133,7 @@ def url_ecdc_continent_one(continent_id, page=1):
@app_ecdc.route('/country/all/page/<int:page>')
@app_ecdc.route('/country/all')
def url_ecdc_country_all(page=1):
- page_info = ApplicationPage('Europe', "country")
+ page_info = WebPageContent('Europe', "country")
page_data = EcdcCountry.get_all_as_page(page)
return render_template(
'ecdc/country/ecdc_country_all.html',
@@ -144,7 +144,7 @@ def url_ecdc_country_all(page=1):
@app_ecdc.route('/country/<int:country_id>/page/<int:page>')
@app_ecdc.route('/country/<int:country_id>')
def url_ecdc_country_one(country_id, page=1):
- page_info = ApplicationPage('Europe', "country")
+ page_info = WebPageContent('Europe', "country")
europe_country = EcdcCountry.get_by_id(country_id)
page_data = EcdcData.find_by_country(europe_country, page)
return render_template(
@@ -157,7 +157,7 @@ def url_ecdc_country_one(country_id, page=1):
@app_ecdc.route('/country/germany/page/<int:page>')
@app_ecdc.route('/country/germany')
def url_ecdc_country_germany(page=1):
- page_info = ApplicationPage('Europe', "country: Germany")
+ page_info = WebPageContent('Europe', "country: Germany")
europe_country = EcdcCountry.get_germany()
if europe_country is None:
flash('country: Germany not found in Database', category='error')
diff --git a/src/flask_covid19/blueprints/owid/owid_test_views.py b/src/flask_covid19/blueprints/owid/owid_test_views.py
index 7b0c803858148fdaf1538c6f065d6044c20c243c..f2dcb65bab58bc19e848d9c9e7717687e11a02c6 100644
--- a/src/flask_covid19/blueprints/owid/owid_test_views.py
+++ b/src/flask_covid19/blueprints/owid/owid_test_views.py
@@ -4,11 +4,11 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from flask_covid19.blueprints.app_all.all_services import owid_service
+from flask_covid19.blueprints.app_web.all_services import owid_service
from flask_covid19.blueprints.app_mq.application_workers import mq
from flask_covid19.blueprints.owid.owid_model import OwidData
from flask_covid19.blueprints.owid.owid_model_import import OwidImport
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.owid.owid_test_service import OwidTestService
@@ -23,7 +23,7 @@ app_owid_test = Blueprint('owid_test', __name__, template_folder='templates', ur
@app_owid_test.route('/tests')
@login_required
def url_owid_test_tests():
- page_info = ApplicationPage('OWID', "Tests")
+ page_info = WebPageContent('OWID', "Tests")
return render_template(
'owid_test/owid_tests.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/owid/owid_views.py b/src/flask_covid19/blueprints/owid/owid_views.py
index 9db9f5704e2296cfcbe6839e32514da3ac68c7fa..9ce0bac6d3ca43912f036ee3f82b3f88160a36a8 100644
--- a/src/flask_covid19/blueprints/owid/owid_views.py
+++ b/src/flask_covid19/blueprints/owid/owid_views.py
@@ -5,9 +5,9 @@ from celery.utils.log import get_task_logger
from flask_admin.contrib.sqla import ModelView
from database import app, admin, db
-from flask_covid19.blueprints.app_all.all_services import owid_service
+from flask_covid19.blueprints.app_web.all_services import owid_service
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
from flask_covid19.blueprints.owid.owid_model_import import OwidImport
@@ -25,7 +25,7 @@ admin.add_view(ModelView(OwidData, db.session, category="OWID"))
@app_owid.route('/info')
def url_owid_info():
- page_info = ApplicationPage('OWID', "Info")
+ page_info = WebPageContent('OWID', "Info")
return render_template(
'owid/owid_info.html',
page_info=page_info)
@@ -33,7 +33,7 @@ def url_owid_info():
@app_owid.route('/tasks')
def url_owid_tasks():
- page_info = ApplicationPage('OWID', "Tasks")
+ page_info = WebPageContent('OWID', "Tasks")
return render_template(
'owid/owid_tasks.html',
page_info=page_info)
@@ -42,7 +42,7 @@ def url_owid_tasks():
@app_owid.route('/imported/page/<int:page>')
@app_owid.route('/imported')
def url_owid_imported(page=1):
- page_info = ApplicationPage('OWID', "Last Import")
+ page_info = WebPageContent('OWID', "Last Import")
try:
page_data = OwidImport.get_all_as_page(page)
except OperationalError:
@@ -57,7 +57,7 @@ def url_owid_imported(page=1):
@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")
+ page_info = WebPageContent('OWID', "Date Reported", "All")
try:
page_data = OwidDateReported.get_all_as_page(page)
except OperationalError:
@@ -73,7 +73,7 @@ def url_owid_date_reported_all(page: int = 1):
@app_owid.route('/date_reported/<int:date_reported_id>')
def url_owid_date_reported_one(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + str(date_reported),
'OWID',
"data of all reported countries for OWID date reported " + str(date_reported) + " "
@@ -94,7 +94,7 @@ def url_owid_date_reported_one(date_reported_id: int, page: int = 1):
@app_owid.route('/date_reported/<int:date_reported_id>/cases_new')
def url_owid_date_reported_one_cases_new(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + str(date_reported),
'OWID',
"data of all reported countries for OWID date reported " + str(date_reported) + " "
@@ -115,7 +115,7 @@ def url_owid_date_reported_one_cases_new(date_reported_id: int, page: int = 1):
@app_owid.route('/date_reported/<int:date_reported_id>/cases_cumulative')
def url_owid_date_reported_one_cases_cumulative(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + str(date_reported),
'OWID',
"data of all reported countries for OWID date reported " + str(date_reported) + " "
@@ -136,7 +136,7 @@ def url_owid_date_reported_one_cases_cumulative(date_reported_id: int, page: int
@app_owid.route('/date_reported/<int:date_reported_id>/deaths_new')
def url_owid_date_reported_one_deaths_new(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + str(date_reported),
'OWID',
"data of all reported countries for OWID date reported " + str(date_reported) + " "
@@ -157,7 +157,7 @@ def url_owid_date_reported_one_deaths_new(date_reported_id: int, page: int = 1):
@app_owid.route('/date_reported/<int:date_reported_id>/deaths_cumulative')
def url_owid_date_reported_one_deaths_cumulative(date_reported_id: int, page: int = 1):
date_reported = OwidDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + str(date_reported),
'OWID',
"data of all reported countries for OWID date reported " + str(date_reported) + " "
@@ -177,7 +177,7 @@ def url_owid_date_reported_one_deaths_cumulative(date_reported_id: int, page: in
@app_owid.route('/continent/all/page/<int:page>')
@app_owid.route('/continent/all')
def url_owid_continent_all(page: int = 1):
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Continents "
'OWID', 'all'
)
@@ -196,7 +196,7 @@ def url_owid_continent_all(page: int = 1):
@app_owid.route('/continent/<int:continent_id>')
def url_owid_continent_one(continent_id: int, page: int = 1):
owid_continent_one = OwidContinent.get_by_id(continent_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"continent: " + owid_continent_one.region,
'OWID',
"countries for OWID continent " + owid_continent_one.region + " "
@@ -216,7 +216,7 @@ def url_owid_continent_one(continent_id: int, page: int = 1):
@app_owid.route('/country/all/page/<int:page>')
@app_owid.route('/country/all')
def url_owid_country_all(page: int = 1):
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Countries "
'OWID', 'all'
)
@@ -235,7 +235,7 @@ def url_owid_country_all(page: int = 1):
@app_owid.route('/country/<int:country_id>')
def url_owid_country_one(country_id: int, page: int = 1):
owid_country_one = OwidCountry.get_by_id(country_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"country: " + owid_country_one.location,
'OWID',
"on continent " + owid_country_one.continent.region + " "
@@ -256,7 +256,7 @@ def url_owid_country_one(country_id: int, page: int = 1):
@app_owid.route('/country/germany')
def url_owid_country_one_germany(page: int = 1):
owid_country_one = OwidCountry.get_germany()
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"country: " + owid_country_one.location,
'OWID',
"on continent " + owid_country_one.continent.region + " "
diff --git a/src/flask_covid19/blueprints/owid/owid_views_diagrams.py b/src/flask_covid19/blueprints/owid/owid_views_diagrams.py
index a70028bde89b0a3fda4ef625be200169e19acda1..43b2d0bfd71c2b821ee2ae2046a1f36a55763445 100644
--- a/src/flask_covid19/blueprints/owid/owid_views_diagrams.py
+++ b/src/flask_covid19/blueprints/owid/owid_views_diagrams.py
@@ -1,19 +1,3 @@
-from flask import render_template, redirect, url_for, flash, Blueprint
-from sqlalchemy.exc import OperationalError
-from celery import states
-from celery.utils.log import get_task_logger
-from flask_admin.contrib.sqla import ModelView
-
-from database import app, admin, db
-from flask_covid19.blueprints.app_all.all_services import owid_service
-from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
-from flask_covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
-from flask_covid19.blueprints.owid.owid_model_import import OwidImport
-
-from flask_covid19.blueprints.owid.owid_views import app_owid
-
-
# def task_owid_download_only(self):
# def task_owid_import_only(self):
# def task_owid_update_dimension_tables_only(self):
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_test_views.py b/src/flask_covid19/blueprints/rki_cases/rki_test_views.py
index 506d8c36aeb5f3ba7cfee8dee4f88808fc8d5b7a..48756ace7560466f9e4ed64b58d093d3140999ed 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_test_views.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_test_views.py
@@ -5,11 +5,11 @@ from flask_login import login_required
from database import app, db
-from flask_covid19.blueprints.app_all.all_services import rki_service
+from flask_covid19.blueprints.app_web.all_services import rki_service
from flask_covid19.blueprints.app_mq.application_workers import mq
from flask_covid19.blueprints.rki_cases.rki_model import RkiData
from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.rki_cases.rki_test_service import RkiTestService
@@ -26,7 +26,7 @@ app_rki_test = Blueprint('rki_test', __name__, template_folder='templates', url_
@login_required
def url_rki_test_tests():
app.logger.info("url_rki_test_tests - START")
- page_info = ApplicationPage('RKI', "Tests")
+ page_info = WebPageContent('RKI', "Tests")
return render_template(
'rki_test/rki_tests.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_views.py b/src/flask_covid19/blueprints/rki_cases/rki_views.py
index 5552e4c4381941ebb5e5d61861a8cf397e02786a..404c627890efbc1afd71dbd4762d9d9c558188c2 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_views.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_views.py
@@ -5,10 +5,10 @@ from celery import states
from database import app, admin, db
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_all.all_services import rki_service
+from flask_covid19.blueprints.app_web.all_services import rki_service
from flask_covid19.blueprints.rki_cases.rki_model import RkiData, RkiMeldedatum
from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
drop_and_create_data_again = True
@@ -27,7 +27,7 @@ admin.add_view(ModelView(RkiData, db.session, category="RKI Cases"))
@app_rki.route('/info')
def url_rki_info():
- page_info = ApplicationPage('RKI', "Info")
+ page_info = WebPageContent('RKI', "Info")
return render_template(
'rki/rki_info.html',
page_info=page_info)
@@ -35,7 +35,7 @@ def url_rki_info():
@app_rki.route('/tasks')
def url_rki_tasks():
- page_info = ApplicationPage('RKI', "Tasks")
+ page_info = WebPageContent('RKI', "Tasks")
return render_template(
'rki/rki_tasks.html',
page_info=page_info)
@@ -44,7 +44,7 @@ def url_rki_tasks():
@app_rki.route('/imported/page/<int:page>')
@app_rki.route('/imported')
def url_rki_imported(page=1):
- page_info = ApplicationPage('RKI', "Last Import")
+ page_info = WebPageContent('RKI', "Last Import")
try:
page_data = RkiImport.get_all_as_page(page)
except OperationalError:
@@ -59,7 +59,7 @@ def url_rki_imported(page=1):
@app_rki.route('/test/page/<int:page>')
@app_rki.route('/test')
def url_rki_test(page=1):
- page_info = ApplicationPage('RKI', "TEST")
+ page_info = WebPageContent('RKI', "TEST")
try:
page_data = RkiImport.get_all_as_page(page)
except OperationalError:
@@ -74,7 +74,7 @@ def url_rki_test(page=1):
@app_rki.route('/date_reported/all/page/<int:page>')
@app_rki.route('/date_reported/all')
def url_rki_date_reported_all(page: int = 1):
- page_info = ApplicationPage('RKI', "Date Reported", "All")
+ page_info = WebPageContent('RKI', "Date Reported", "All")
try:
page_data = RkiMeldedatum.get_all_as_page(page)
except OperationalError:
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
index 11d14797275bc33ad9953965a612fb5bcccf2eb2..eebda1e0fd442a4b56bfa2e2020f3787b1b84b37 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
@@ -4,13 +4,13 @@ from celery.utils.log import get_task_logger
from flask_admin.contrib.sqla import ModelView
from database import admin, db
-from flask_covid19.blueprints.app_all.all_services import rki_vaccination_service
+from flask_covid19.blueprints.app_web.all_services import rki_vaccination_service
from flask_covid19.blueprints.app_mq.application_workers import mq
from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationData
from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported
from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
app_rki_vaccination = Blueprint('rki_vaccination', __name__, template_folder='templates', url_prefix='/rki/vaccination')
@@ -26,7 +26,7 @@ admin.add_view(ModelView(RkiVaccinationData, db.session, category="RKI Vaccinati
@app_rki_vaccination.route('/info')
def url_vaccination_info():
- page_info = ApplicationPage('Vaccination', "Info")
+ page_info = WebPageContent('Vaccination', "Info")
return render_template(
'rki_vaccination/rki_vaccination_info.html',
page_info=page_info)
@@ -34,7 +34,7 @@ def url_vaccination_info():
@app_rki_vaccination.route('/tasks')
def url_vaccination_tasks():
- page_info = ApplicationPage('Vaccination', "Tasks")
+ page_info = WebPageContent('Vaccination', "Tasks")
return render_template(
'rki_vaccination/rki_vaccination_tasks.html',
page_info=page_info)
@@ -43,7 +43,7 @@ def url_vaccination_tasks():
@app_rki_vaccination.route('/imported/page/<int:page>')
@app_rki_vaccination.route('/imported')
def url_vaccination_imported(page=1):
- page_info = ApplicationPage('Vaccination', "Data: Germany Timeline imported")
+ page_info = WebPageContent('Vaccination', "Data: Germany Timeline imported")
page_data = RkiVaccinationImport.get_all_as_page(page)
return render_template(
'rki_vaccination/imported/rki_vaccination_imported.html',
@@ -54,7 +54,7 @@ def url_vaccination_imported(page=1):
@app_rki_vaccination.route('/data/page/<int:page>')
@app_rki_vaccination.route('/data')
def url_vaccination_data(page=1):
- page_info = ApplicationPage('Vaccination', "Data: Germany Timeline")
+ page_info = WebPageContent('Vaccination', "Data: Germany Timeline")
page_data = RkiVaccinationData.get_all_as_page(page)
return render_template(
'rki_vaccination/data/rki_vaccination_data.html',
diff --git a/src/flask_covid19/blueprints/who/who_test_views.py b/src/flask_covid19/blueprints/who/who_test_views.py
index 4bf85d780254472662d3e56b63a5eddcdff366da..aae378279354c40125d25979fd7de327a4a6f68a 100644
--- a/src/flask_covid19/blueprints/who/who_test_views.py
+++ b/src/flask_covid19/blueprints/who/who_test_views.py
@@ -4,9 +4,9 @@ from celery.utils.log import get_task_logger
from flask_login import login_required
from database import app, db
-from flask_covid19.blueprints.app_all.all_services import who_service
+from flask_covid19.blueprints.app_web.all_services import who_service
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.who.who_model_import import WhoImport
from flask_covid19.blueprints.who.who_model import WhoData
@@ -25,7 +25,7 @@ app_who_test = Blueprint('who_test', __name__, template_folder='templates', url_
@app_who_test.route('/tests')
@login_required
def url_who_test_tests():
- page_info = ApplicationPage('WHO', "Tests")
+ page_info = WebPageContent('WHO', "Tests")
return render_template(
'who_test/who_tests.html',
page_info=page_info)
diff --git a/src/flask_covid19/blueprints/who/who_views.py b/src/flask_covid19/blueprints/who/who_views.py
index 958bd295ecf7fc3ef03ec19adc1675cbb8e6910f..1bc63abcc20b879391b8c2e0dc12dc798df46c68 100644
--- a/src/flask_covid19/blueprints/who/who_views.py
+++ b/src/flask_covid19/blueprints/who/who_views.py
@@ -6,9 +6,9 @@ from flask_admin.contrib.sqla import ModelView
from flask_login import login_required
from database import app, admin, db
-from flask_covid19.blueprints.app_all.all_services import who_service
+from flask_covid19.blueprints.app_web.all_services import who_service
from flask_covid19.blueprints.app_mq.application_workers import mq
-from flask_covid19.blueprints.app_web.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
from flask_covid19.blueprints.who.who_model_import import WhoImport
from flask_covid19.blueprints.who.who_model import WhoCountryRegion, WhoCountry, WhoDateReported, WhoData
@@ -30,7 +30,7 @@ admin.add_view(ModelView(WhoData, db.session, category="WHO"))
@app_who.route('/info')
def url_who_info():
- page_info = ApplicationPage('WHO', "Info")
+ page_info = WebPageContent('WHO', "Info")
return render_template(
'who/who_info.html',
page_info=page_info)
@@ -39,7 +39,7 @@ def url_who_info():
@app_who.route('/tasks')
@login_required
def url_who_tasks():
- page_info = ApplicationPage('WHO', "Tasks")
+ page_info = WebPageContent('WHO', "Tasks")
return render_template(
'who/who_tasks.html',
page_info=page_info)
@@ -49,7 +49,7 @@ def url_who_tasks():
@app_who.route('/imported')
@login_required
def url_who_imported(page=1):
- page_info = ApplicationPage('WHO', "Last Import")
+ page_info = WebPageContent('WHO', "Last Import")
try:
page_data = WhoImport.get_all_as_page(page)
except OperationalError:
@@ -64,7 +64,7 @@ def url_who_imported(page=1):
@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")
+ page_info = WebPageContent('WHO', "Date Reported", "All")
try:
page_data = WhoDateReported.get_all_as_page(page)
except OperationalError:
@@ -80,7 +80,7 @@ def url_who_date_reported_all(page: int = 1):
@app_who.route('/date_reported/<int:date_reported_id>')
def url_who_date_reported(date_reported_id: int, page: int = 1):
date_reported = WhoDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported_import_str,
'WHO',
"data of all reported countries for WHO date reported " + date_reported.date_reported_import_str + " "
@@ -101,7 +101,7 @@ def url_who_date_reported(date_reported_id: int, page: int = 1):
@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):
date_reported = WhoDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'WHO',
"data of all reported countries for WHO date reported " + date_reported.date_reported + " "
@@ -122,7 +122,7 @@ def url_who_date_reported_cases_new(date_reported_id: int, page: int = 1):
@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):
date_reported = WhoDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'WHO',
"data of all reported countries for WHO date reported " + date_reported.date_reported + " "
@@ -143,7 +143,7 @@ def url_who_date_reported_cases_cumulative(date_reported_id: int, page: int = 1)
@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):
date_reported = WhoDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'WHO',
"data of all reported countries for WHO date reported " + date_reported.date_reported + " "
@@ -164,7 +164,7 @@ def url_who_date_reported_deaths_new(date_reported_id: int, page: int = 1):
@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):
date_reported = WhoDateReported.get_by_id(date_reported_id)
- page_info = ApplicationPage(
+ page_info = WebPageContent(
"Date Reported: " + date_reported.date_reported,
'WHO',
"data of all reported countries for WHO date reported " + date_reported.date_reported + " "
@@ -184,7 +184,7 @@ def url_who_date_reported_deaths_cumulative(date_reported_id: int, page: int = 1
@app_who.route('/region/all/page/<int:page>')
@app_who.route('/region/all')
def url_who_region_all(page: int = 1):
- page_info = ApplicationPage('WHO', "Region", "All")
+ page_info = WebPageContent('WHO', "Region", "All")
try:
page_data = WhoCountryRegion.get_all_as_page(page)
except OperationalError:
@@ -200,7 +200,7 @@ def url_who_region_all(page: int = 1):
@app_who.route('/region/<int:region_id>')
def url_who_region(region_id: int, page: int = 1):
who_region = None
- page_info = ApplicationPage("Countries", "WHO Region")
+ page_info = WebPageContent("Countries", "WHO Region")
try:
who_region = WhoCountryRegion.get_by_id(region_id)
page_data = WhoCountry.get_who_countries_for_region(who_region, page)
@@ -220,7 +220,7 @@ def url_who_region(region_id: int, page: int = 1):
@app_who.route('/country/all/page/<int:page>')
@app_who.route('/country/all')
def url_who_country_all(page: int = 1):
- page_info = ApplicationPage('WHO', "Countries", "All")
+ page_info = WebPageContent('WHO', "Countries", "All")
try:
page_data = WhoCountry.get_all_as_page(page)
except OperationalError:
@@ -237,9 +237,9 @@ def url_who_country_all(page: int = 1):
def url_who_country(country_id: int, page: int = 1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoData.get_data_for_country(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ page_info = WebPageContent(who_country.country,
+ "Country " + who_country.country_code,
+ "Data per Day in Country " + who_country.country +" of WHO Region " + who_country.region.region)
return render_template(
'who/country/who_country_one.html',
who_country=who_country,
@@ -252,9 +252,9 @@ def url_who_country(country_id: int, page: int = 1):
def url_who_country_cases_new(country_id: int, page: int = 1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoData.get_data_for_country_order_by_cases_new(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ page_info = WebPageContent(who_country.country,
+ "Country " + who_country.country_code,
+ "Data per Day in Country " + who_country.country +" of WHO Region " + who_country.region.region)
return render_template(
'who/country/who_country_one_cases_new.html',
who_country=who_country,
@@ -267,9 +267,9 @@ def url_who_country_cases_new(country_id: int, page: int = 1):
def url_who_country_cases_cumulative(country_id: int, page: int = 1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoData.get_data_for_country_order_by_cases_cumulative(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ page_info = WebPageContent(who_country.country,
+ "Country " + who_country.country_code,
+ "Data per Day in Country " + who_country.country +" of WHO Region " + who_country.region.region)
return render_template(
'who/country/who_country_one_cases_cumulative.html',
who_country=who_country,
@@ -282,9 +282,9 @@ def url_who_country_cases_cumulative(country_id: int, page: int = 1):
def url_who_country_deaths_new(country_id: int, page: int = 1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoData.get_data_for_country_order_by_deaths_new(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ page_info = WebPageContent(who_country.country,
+ "Country " + who_country.country_code,
+ "Data per Day in Country " + who_country.country +" of WHO Region " + who_country.region.region)
return render_template(
'who/country/who_country_one_deaths_new.html',
who_country=who_country,
@@ -297,9 +297,9 @@ def url_who_country_deaths_new(country_id: int, page: int = 1):
def url_who_country_deaths_cumulative(country_id: int, page: int = 1):
who_country = WhoCountry.get_by_id(country_id)
page_data = WhoData.get_data_for_country_order_by_deaths_cumulative(who_country, page)
- page_info = ApplicationPage(who_country.country,
- "Country "+who_country.country_code,
- "Data per Day in Country "+who_country.country+" of WHO Region "+who_country.region.region)
+ page_info = WebPageContent(who_country.country,
+ "Country " + who_country.country_code,
+ "Data per Day in Country " + who_country.country +" of WHO Region " + who_country.region.region)
return render_template(
'who/country/who_country_one_deaths_cumulative.html',
who_country=who_country,
@@ -310,7 +310,7 @@ def url_who_country_deaths_cumulative(country_id: int, page: int = 1):
@app_who.route('/germany/page/<int:page>')
@app_who.route('/germany')
def url_who_germany(page: int = 1):
- page_info = ApplicationPage('WHO', "Germany")
+ page_info = WebPageContent('WHO', "Germany")
who_country_germany = WhoCountry.get_germany()
if who_country_germany is None:
flash('country: Germany not found in Database', category='error')