diff --git a/src/covid19/__init__.py b/src/covid19/__init__.py
index 758c134311bf2827535bb0b9536af445fbd53797..8b49bddecfe91e5b1ca617ff913ef34d903a39b7 100644
--- a/src/covid19/__init__.py
+++ b/src/covid19/__init__.py
@@ -1,6 +1,6 @@
from database import app, run_run_with_debug, port
-import covid19.views
+import covid19.app_views
#################################################################################################################
#
diff --git a/src/covid19/app_services.py b/src/covid19/app_services.py
index 01de940e52a1482af42bff9cc06272cedfb7a5c9..de9e80a785f5f65cde3024a752f72449b7e63fe7 100644
--- a/src/covid19/app_services.py
+++ b/src/covid19/app_services.py
@@ -2,7 +2,7 @@ from database import db
from covid19.blueprints.common.common_service import CommonService
from covid19.blueprints.who.who_service import WhoService
-from covid19.blueprints.europe.europe_service import EuropeService
+from covid19.blueprints.ecdc.europe_service import EuropeService
from covid19.blueprints.rki_bundeslaender.rki_service import RkiBundeslaenderService
from covid19.blueprints.rki_landkreise.rki_service import RkiLandkreiseService
from covid19.blueprints.rki_vaccination.vaccination_service import VaccinationService
diff --git a/src/covid19/app_views.py b/src/covid19/app_views.py
index a5b98e3308450c3707a931dee3e404875df8274d..74cdaf2b4b4ac6227d4b97ccec0c14ff409b2073 100644
--- a/src/covid19/app_views.py
+++ b/src/covid19/app_views.py
@@ -2,27 +2,27 @@ from flask import render_template, redirect, url_for
from database import app
from covid19.blueprints.common.common_model_transient import ApplicationPage
-import covid19.blueprints.who.who_views
-import covid19.blueprints.europe.europe_views
-import covid19.blueprints.rki_vaccination.vaccination_views
-import covid19.blueprints.rki_landkreise.rki_views
-import covid19.blueprints.rki_bundeslaender.rki_views
import covid19.blueprints.admin.admin_views
+import covid19.blueprints.ecdc.europe_views
+import covid19.blueprints.rki_bundeslaender.rki_views
+import covid19.blueprints.rki_landkreise.rki_views
+import covid19.blueprints.rki_vaccination.rki_vaccination_views
+import covid19.blueprints.who.who_views
+
-from covid19.blueprints.who.who_views import app_who
-from covid19.blueprints.europe.europe_views import app_europe
-from covid19.blueprints.rki_vaccination.vaccination_views import app_rki_vaccination
-from covid19.blueprints.rki_landkreise.rki_views import app_rki_landkreise
-from covid19.blueprints.rki_bundeslaender.rki_views import app_rki_bundeslaender
from covid19.blueprints.admin.admin_views import app_admin
+from covid19.blueprints.ecdc.ecdc_views import app_ecdc
+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
-app.register_blueprint(app_who, url_prefix='/who')
-app.register_blueprint(app_europe, url_prefix='/europe')
-app.register_blueprint(app_rki_vaccination, url_prefix='/rki/vaccination')
+app.register_blueprint(app_admin, url_prefix='/admin')
+app.register_blueprint(app_ecdc, url_prefix='/ecdc')
app.register_blueprint(app_rki_bundeslaender, url_prefix='/rki/bundeslaender')
app.register_blueprint(app_rki_landkreise, url_prefix='/rki/landkreise')
-app.register_blueprint(app_admin, url_prefix='/admin')
-
+app.register_blueprint(app_rki_vaccination, url_prefix='/rki/vaccination')
+app.register_blueprint(app_who, url_prefix='/who')
############################################################################################
#
diff --git a/src/covid19/blueprints/europe/__init__.py b/src/covid19/blueprints/ecdc/__init__.py
similarity index 100%
rename from src/covid19/blueprints/europe/__init__.py
rename to src/covid19/blueprints/ecdc/__init__.py
diff --git a/src/covid19/blueprints/europe/europe_model.py b/src/covid19/blueprints/ecdc/ecdc_model.py
similarity index 100%
rename from src/covid19/blueprints/europe/europe_model.py
rename to src/covid19/blueprints/ecdc/ecdc_model.py
diff --git a/src/covid19/blueprints/europe/europe_model_import.py b/src/covid19/blueprints/ecdc/ecdc_model_import.py
similarity index 100%
rename from src/covid19/blueprints/europe/europe_model_import.py
rename to src/covid19/blueprints/ecdc/ecdc_model_import.py
diff --git a/src/covid19/blueprints/europe/europe_service.py b/src/covid19/blueprints/ecdc/ecdc_service.py
similarity index 94%
rename from src/covid19/blueprints/europe/europe_service.py
rename to src/covid19/blueprints/ecdc/ecdc_service.py
index bf1fc231e8721d58687ade183547339efd7ac3c2..e3ecfe0ccb85c3fdece8a76dcba916ff82b3071a 100644
--- a/src/covid19/blueprints/europe/europe_service.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service.py
@@ -1,9 +1,9 @@
from flask import flash
from database import app
-from covid19.blueprints.europe.europe_service_download import EuropeServiceDownload
-from covid19.blueprints.europe.europe_service_import import EuropeServiceImport
-from covid19.blueprints.europe.europe_service_update import EuropeServiceUpdate
+from covid19.blueprints.ecdc.europe_service_download import EuropeServiceDownload
+from covid19.blueprints.ecdc.europe_service_import import EuropeServiceImport
+from covid19.blueprints.ecdc.europe_service_update import EuropeServiceUpdate
# TODO: #111 refactor to new method scheme itroduced 07.02.2021
diff --git a/src/covid19/blueprints/europe/europe_service_config.py b/src/covid19/blueprints/ecdc/ecdc_service_config.py
similarity index 100%
rename from src/covid19/blueprints/europe/europe_service_config.py
rename to src/covid19/blueprints/ecdc/ecdc_service_config.py
diff --git a/src/covid19/blueprints/europe/europe_service_download.py b/src/covid19/blueprints/ecdc/ecdc_service_download.py
similarity index 97%
rename from src/covid19/blueprints/europe/europe_service_download.py
rename to src/covid19/blueprints/ecdc/ecdc_service_download.py
index f2d366a935eff303723e24a337907aa745e5791a..0b096c50f4945cc0338ce372c756a10b8ceccc95 100644
--- a/src/covid19/blueprints/europe/europe_service_download.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_download.py
@@ -2,7 +2,7 @@ import os
import wget
from flask import flash
from database import app
-from covid19.blueprints.europe.europe_service_config import EuropeServiceConfig
+from covid19.blueprints.ecdc.europe_service_config import EuropeServiceConfig
class EuropeServiceDownload:
diff --git a/src/covid19/blueprints/europe/europe_service_import.py b/src/covid19/blueprints/ecdc/ecdc_service_import.py
similarity index 95%
rename from src/covid19/blueprints/europe/europe_service_import.py
rename to src/covid19/blueprints/ecdc/ecdc_service_import.py
index b8dac394124a8ee1268b7ade78e0ea9e26dd5455..393e2a6a22b1cfa451f9cc3ccd4e41921f624896 100644
--- a/src/covid19/blueprints/europe/europe_service_import.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_import.py
@@ -3,8 +3,8 @@ import csv
import psycopg2
from database import db, app
-from covid19.blueprints.europe.europe_model_import import EuropeImport
-from covid19.blueprints.europe.europe_service_config import EuropeServiceConfig
+from covid19.blueprints.ecdc.europe_model_import import EuropeImport
+from covid19.blueprints.ecdc.europe_service_config import EuropeServiceConfig
class EuropeServiceImport:
diff --git a/src/covid19/blueprints/europe/europe_service_update.py b/src/covid19/blueprints/ecdc/ecdc_service_update.py
similarity index 97%
rename from src/covid19/blueprints/europe/europe_service_update.py
rename to src/covid19/blueprints/ecdc/ecdc_service_update.py
index a75c94d83a22dea10a304f661d230671a394bf37..65fa1edf4902212a85e5a947d894e84d508ea800 100644
--- a/src/covid19/blueprints/europe/europe_service_update.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
-from covid19.blueprints.europe.europe_service_config import EuropeServiceConfig
-from covid19.blueprints.europe.europe_model_import import EuropeImport
-from covid19.blueprints.europe.europe_model import EuropeDateReported, EuropeContinent, EuropeCountry, EuropeData
+from covid19.blueprints.ecdc.europe_service_config import EuropeServiceConfig
+from covid19.blueprints.ecdc.europe_model_import import EuropeImport
+from covid19.blueprints.ecdc.europe_model import EuropeDateReported, EuropeContinent, EuropeCountry, EuropeData
# TODO: #117 refactor EuropeServiceUpdate to new method scheme introduced 07.02.2021
diff --git a/src/covid19/blueprints/europe/europe_views.py b/src/covid19/blueprints/ecdc/ecdc_views.py
similarity index 56%
rename from src/covid19/blueprints/europe/europe_views.py
rename to src/covid19/blueprints/ecdc/ecdc_views.py
index 1856163a47d18bb0d63fca4a74aa9ae5c201d508..5c5b126b5a007af881eb36b4764607db048b6b04 100644
--- a/src/covid19/blueprints/europe/europe_views.py
+++ b/src/covid19/blueprints/ecdc/ecdc_views.py
@@ -3,15 +3,15 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-from covid19.services import europe_service
-from covid19.workers import celery
+from covid19.app_services import europe_service
+from covid19.app_workers import celery
-from covid19.blueprints.europe.europe_model_import import EuropeImport
-from covid19.blueprints.europe.europe_model import EuropeDateReported, EuropeContinent, EuropeCountry, EuropeData
+from covid19.blueprints.ecdc.ecdc_model_import import EuropeImport
+from covid19.blueprints.ecdc.ecdc_model import EuropeDateReported, EuropeContinent, EuropeCountry, EuropeData
from covid19.blueprints.common.common_model_transient import ApplicationPage
-app_europe = Blueprint('europe', __name__, template_folder='templates')
+app_ecdc = Blueprint('ecdc', __name__, template_folder='templates', url_prefix='/ecdc')
##################################################################################################################
@@ -23,138 +23,138 @@ app_europe = Blueprint('europe', __name__, template_folder='templates')
# TODO remove DEPRECATED
@celery.task(bind=True)
-def task_europe_update_initial_DEPRECATED(self):
+def task_ecdc_update_initial_DEPRECATED(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_initial [OK] ")
+ logger.info(" Received: task_ecdc_update_initial [OK] ")
logger.info("------------------------------------------------------------")
europe_service.run_update_initial_DEPRECATED()
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_initial)"
+ result = "OK (task_ecdc_update_initial)"
return result
# TODO remove DEPRECATED
@celery.task(bind=True)
-def task_europe_update_short_DEPRECATED(self):
+def task_ecdc_update_short_DEPRECATED(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_short [OK] ")
+ logger.info(" Received: task_ecdc_update_short [OK] ")
logger.info("------------------------------------------------------------")
europe_service.run_update_short_DEPRECATED()
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_short)"
+ result = "OK (task_ecdc_update_short)"
return result
@celery.task(bind=True)
-def task_europe_download_only(self):
+def task_ecdc_download_only(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_download_only [OK] ")
+ logger.info(" Received: task_ecdc_download_only [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_download_only() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_download_only)"
+ result = "OK (task_ecdc_download_only)"
return result
@celery.task(bind=True)
-def task_europe_import_only(self):
+def task_ecdc_import_only(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_import_only [OK] ")
+ logger.info(" Received: task_ecdc_import_only [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_import_only() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_import_only)"
+ result = "OK (task_ecdc_import_only)"
return result
@celery.task(bind=True)
-def task_europe_update_dimension_tables_only(self):
+def task_ecdc_update_dimension_tables_only(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_dimension_tables_only [OK] ")
+ logger.info(" Received: task_ecdc_update_dimension_tables_only [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_update_dimension_tables_only() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_dimension_tables_only)"
+ result = "OK (task_ecdc_update_dimension_tables_only)"
return result
@celery.task(bind=True)
-def task_europe_update_fact_table_incremental_only(self):
+def task_ecdc_update_fact_table_incremental_only(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_fact_table_incremental_only [OK] ")
+ logger.info(" Received: task_ecdc_update_fact_table_incremental_only [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_update_fact_table_incremental_only() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_fact_table_incremental_only)"
+ result = "OK (task_ecdc_update_fact_table_incremental_only)"
return result
@celery.task(bind=True)
-def task_europe_update_fact_table_initial_only(self):
+def task_ecdc_update_fact_table_initial_only(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_fact_table_initial_only [OK] ")
+ logger.info(" Received: task_ecdc_update_fact_table_initial_only [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_update_fact_table_initial_only() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_fact_table_initial_only)"
+ result = "OK (task_ecdc_update_fact_table_initial_only)"
return result
@celery.task(bind=True)
-def task_europe_update_fact_table_initial_only(self):
+def task_ecdc_update_fact_table_initial_only(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_fact_table_initial_only [OK] ")
+ logger.info(" Received: task_ecdc_update_fact_table_initial_only [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_update_fact_table_initial_only() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_fact_table_initial_only)"
+ result = "OK (task_ecdc_update_fact_table_initial_only)"
return result
@celery.task(bind=True)
-def task_europe_update_star_schema_incremental(self):
+def task_ecdc_update_star_schema_incremental(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_star_schema_incremental [OK] ")
+ logger.info(" Received: task_ecdc_update_star_schema_incremental [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_update_star_schema_incremental() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_star_schema_incremental)"
+ result = "OK (task_ecdc_update_star_schema_incremental)"
return result
@celery.task(bind=True)
-def task_europe_update_star_schema_initial(self):
+def task_ecdc_update_star_schema_initial(self):
logger = get_task_logger(__name__)
self.update_state(state=states.STARTED)
logger.info("------------------------------------------------------------")
- logger.info(" Received: task_europe_update_star_schema_initial [OK] ")
+ logger.info(" Received: task_ecdc_update_star_schema_initial [OK] ")
logger.info("------------------------------------------------------------")
europe_service.task_update_star_schema_initial() # TODO
self.update_state(state=states.SUCCESS)
- result = "OK (task_europe_update_star_schema_initial)"
+ result = "OK (task_ecdc_update_star_schema_initial)"
return result
-@app_europe.route('/info')
-def url_europe_info():
+@app_ecdc.route('/info')
+def url_ecdc_info():
page_info = ApplicationPage('Europe', "Info")
return render_template(
'europe/europe_info.html',
@@ -162,8 +162,8 @@ def url_europe_info():
page_info=page_info)
-@app_europe.route('/tasks')
-def url_europe_tasks():
+@app_ecdc.route('/tasks')
+def url_ecdc_tasks():
page_info = ApplicationPage('Europe', "Tasks")
return render_template(
'europe/europe_tasks.html',
@@ -171,9 +171,9 @@ def url_europe_tasks():
page_info=page_info)
-@app_europe.route('/imported/page/<int:page>')
-@app_europe.route('/imported')
-def url_europe_data_imported(page=1):
+@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_data = EuropeImport.get_all_as_page(page)
return render_template(
@@ -182,9 +182,9 @@ def url_europe_data_imported(page=1):
page_info=page_info)
-@app_europe.route('/date_reported/all/page/<int:page>')
-@app_europe.route('/date_reported/all')
-def url_europe_date_reported_all(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_data = EuropeDateReported.get_all_as_page(page)
return render_template(
@@ -193,11 +193,11 @@ def url_europe_date_reported_all(page=1):
page_info=page_info)
-@app_europe.route('/date_reported/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/date_reported/<int:europe_date_reported_id>')
-@app_europe.route('/date_reported/notification_rate/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/date_reported/notification_rate/<int:europe_date_reported_id>')
-def url_europe_date_reported_one_notification_rate(europe_date_reported_id, page=1):
+@app_ecdc.route('/date_reported/<int:europe_date_reported_id>/page/<int:page>')
+@app_ecdc.route('/date_reported/<int:europe_date_reported_id>')
+@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")
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_notification_rate(europe_date_reported, page)
@@ -208,9 +208,9 @@ def url_europe_date_reported_one_notification_rate(europe_date_reported_id, page
page_info=page_info)
-@app_europe.route('/date_reported/deaths_weekly/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/date_reported/deaths_weekly/<int:europe_date_reported_id>')
-def url_europe_date_reported_one_deaths_weekly(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")
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_deaths_weekly(europe_date_reported, page)
@@ -221,9 +221,9 @@ def url_europe_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
page_info=page_info)
-@app_europe.route('/date_reported/cases_weekly/<int:europe_date_reported_id>/page/<int:page>')
-@app_europe.route('/date_reported/cases_weekly/<int:europe_date_reported_id>')
-def url_europe_date_reported_one_cases_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")
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_cases_weekly(europe_date_reported, page)
@@ -234,9 +234,9 @@ def url_europe_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
page_info=page_info)
-@app_europe.route('/continent/all/page/<int:page>')
-@app_europe.route('/continent/all')
-def url_europe_continent_all(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_data = EuropeContinent.get_all_as_page(page)
return render_template(
@@ -245,9 +245,9 @@ def url_europe_continent_all(page=1):
page_info=page_info)
-@app_europe.route('/continent/<int:continent_id>/page/<int:page>')
-@app_europe.route('/continent/<int:continent_id>')
-def url_europe_continent_one(continent_id, 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")
continent = EuropeContinent.get_by_id(continent_id)
page_data = EuropeCountry.find_by_continent(continent, page)
@@ -258,9 +258,9 @@ def url_europe_continent_one(continent_id, page=1):
page_info=page_info)
-@app_europe.route('/country/all/page/<int:page>')
-@app_europe.route('/country/all')
-def url_europe_country_all(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_data = EuropeCountry.get_all_as_page(page)
return render_template(
@@ -269,9 +269,9 @@ def url_europe_country_all(page=1):
page_info=page_info)
-@app_europe.route('/country/<int:country_id>/page/<int:page>')
-@app_europe.route('/country/<int:country_id>')
-def url_europe_country_one(country_id, 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")
europe_country = EuropeCountry.get_by_id(country_id)
page_data = EuropeData.find_by_country(europe_country, page)
@@ -282,14 +282,14 @@ def url_europe_country_one(country_id, page=1):
page_info=page_info)
-@app_europe.route('/country/germany/page/<int:page>')
-@app_europe.route('/country/germany')
-def url_europe_country_germany(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")
europe_country = EuropeCountry.get_germany()
if europe_country is None:
flash('country: Germany not found in Database', category='error')
- return redirect(url_for('url_europe_tasks'))
+ return redirect(url_for('url_ecdc_tasks'))
page_data = EuropeData.find_by_country(europe_country, page)
return render_template(
'europe/country/europe_country_germany.html',
@@ -299,67 +299,67 @@ def url_europe_country_germany(page=1):
# TODO remove DEPRECATED
-@app_europe.route('/update/initial')
-def url_europe_task_update_data_DEPRECATED():
+@app_ecdc.route('/update/initial')
+def url_ecdc_task_update_data_DEPRECATED():
europe_service.download_DEPRECATED()
- task_europe_update_initial_DEPRECATED.apply_async()
- flash("task_europe_update_initial started")
- return redirect(url_for('url_europe_tasks'))
+ task_ecdc_update_initial_DEPRECATED.apply_async()
+ flash("task_ecdc_update_initial started")
+ return redirect(url_for('url_ecdc_tasks'))
# TODO remove DEPRECATED
-@app_europe.route('/update/short')
-def url_europe_task_update_data_short_DEPRECATED():
+@app_ecdc.route('/update/short')
+def url_ecdc_task_update_data_short_DEPRECATED():
europe_service.download_DEPRECATED()
- task_europe_update_short_DEPRECATED.apply_async()
- flash("task_europe_update_short started")
- return redirect(url_for('url_europe_tasks'))
+ task_ecdc_update_short_DEPRECATED.apply_async()
+ flash("task_ecdc_update_short started")
+ return redirect(url_for('url_ecdc_tasks'))
-# TODO: #163 implement url_europe_task_update_star_schema_initial in europe_views.py
-@app_europe.route('/task/update/star_schema/initial')
-def url_europe_task_update_star_schema_initial():
- flash("url_europe_task_update_star_schema_initial started")
- return redirect(url_for('url_europe_tasks'))
+# TODO: #163 implement url_ecdc_task_update_star_schema_initial in europe_views.py
+@app_ecdc.route('/task/update/star_schema/initial')
+def url_ecdc_task_update_star_schema_initial():
+ flash("url_ecdc_task_update_star_schema_initial started")
+ return redirect(url_for('url_ecdc_tasks'))
-# TODO: #164 implement url_europe_task_update_starschema_incremental in europe_views.py
-@app_europe.route('/task/update/star_schema/incremental')
-def url_europe_task_update_starschema_incremental():
- flash("url_europe_task_update_starschema_incremental started")
- return redirect(url_for('url_europe_tasks'))
+# TODO: #164 implement url_ecdc_task_update_starschema_incremental in europe_views.py
+@app_ecdc.route('/task/update/star_schema/incremental')
+def url_ecdc_task_update_starschema_incremental():
+ flash("url_ecdc_task_update_starschema_incremental started")
+ return redirect(url_for('url_ecdc_tasks'))
-# TODO: #165 implement url_europe_task_download_only in europe_views.py
-@app_europe.route('/task/download/only')
-def url_europe_task_download_only():
- flash("url_europe_task_download_only started")
- return redirect(url_for('url_europe_tasks'))
+# TODO: #165 implement url_ecdc_task_download_only in europe_views.py
+@app_ecdc.route('/task/download/only')
+def url_ecdc_task_download_only():
+ flash("url_ecdc_task_download_only started")
+ return redirect(url_for('url_ecdc_tasks'))
-# TODO: #166 implement url_europe_task_import_only in europe_views.py
-@app_europe.route('/task/import/only')
-def url_europe_task_import_only():
- flash("url_europe_task_import_only started")
- return redirect(url_for('url_europe_tasks'))
+# TODO: #166 implement url_ecdc_task_import_only in europe_views.py
+@app_ecdc.route('/task/import/only')
+def url_ecdc_task_import_only():
+ flash("url_ecdc_task_import_only started")
+ return redirect(url_for('url_ecdc_tasks'))
-# TODO: #167 implement url_europe_task_update_dimensiontables_only in europe_views.py
-@app_europe.route('/task/update/dimension-tables/only')
-def url_europe_task_update_dimensiontables_only():
- flash("url_europe_task_update_dimensiontables_only started")
- return redirect(url_for('url_europe_tasks'))
+# TODO: #167 implement url_ecdc_task_update_dimensiontables_only in europe_views.py
+@app_ecdc.route('/task/update/dimension-tables/only')
+def url_ecdc_task_update_dimensiontables_only():
+ flash("url_ecdc_task_update_dimensiontables_only started")
+ return redirect(url_for('url_ecdc_tasks'))
-# TODO: #168 implement url_europe_task_update_facttable_incremental_only in europe_views.py
-@app_europe.route('/task/update/fact-table/incremental/only')
-def url_europe_task_update_facttable_incremental_only():
- flash("url_europe_task_update_facttable_incremental_only started")
- return redirect(url_for('url_europe_tasks'))
+# TODO: #168 implement url_ecdc_task_update_facttable_incremental_only in europe_views.py
+@app_ecdc.route('/task/update/fact-table/incremental/only')
+def url_ecdc_task_update_facttable_incremental_only():
+ flash("url_ecdc_task_update_facttable_incremental_only started")
+ return redirect(url_for('url_ecdc_tasks'))
-# TODO: #169 implement url_europe_task_update_facttable_initial_only in europe_views.py
-@app_europe.route('/task/update/fact-table/initial/only')
-def url_europe_task_update_facttable_initial_only():
- flash("url_europe_task_update_facttable_initial_only started")
- return redirect(url_for('url_europe_tasks'))
+# TODO: #169 implement url_ecdc_task_update_facttable_initial_only in europe_views.py
+@app_ecdc.route('/task/update/fact-table/initial/only')
+def url_ecdc_task_update_facttable_initial_only():
+ flash("url_ecdc_task_update_facttable_initial_only started")
+ return redirect(url_for('url_ecdc_tasks'))
diff --git a/src/covid19/blueprints/europe/templates/__init__.py b/src/covid19/blueprints/ecdc/templates/__init__.py
similarity index 100%
rename from src/covid19/blueprints/europe/templates/__init__.py
rename to src/covid19/blueprints/ecdc/templates/__init__.py
diff --git a/src/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html b/src/covid19/blueprints/ecdc/templates/europe/continent/ecdc_continent_all.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/continent/europe_continent_all.html
rename to src/covid19/blueprints/ecdc/templates/europe/continent/ecdc_continent_all.html
diff --git a/src/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html b/src/covid19/blueprints/ecdc/templates/europe/continent/ecdc_continent_germany.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/continent/europe_continent_germany.html
rename to src/covid19/blueprints/ecdc/templates/europe/continent/ecdc_continent_germany.html
diff --git a/src/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html b/src/covid19/blueprints/ecdc/templates/europe/continent/ecdc_continent_one.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/continent/europe_continent_one.html
rename to src/covid19/blueprints/ecdc/templates/europe/continent/ecdc_continent_one.html
diff --git a/src/covid19/blueprints/europe/templates/europe/country/europe_country_all.html b/src/covid19/blueprints/ecdc/templates/europe/country/ecdc_country_all.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/country/europe_country_all.html
rename to src/covid19/blueprints/ecdc/templates/europe/country/ecdc_country_all.html
diff --git a/src/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html b/src/covid19/blueprints/ecdc/templates/europe/country/ecdc_country_germany.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/country/europe_country_germany.html
rename to src/covid19/blueprints/ecdc/templates/europe/country/ecdc_country_germany.html
diff --git a/src/covid19/blueprints/europe/templates/europe/country/europe_country_one.html b/src/covid19/blueprints/ecdc/templates/europe/country/ecdc_country_one.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/country/europe_country_one.html
rename to src/covid19/blueprints/ecdc/templates/europe/country/ecdc_country_one.html
diff --git a/src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html b/src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_all.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_all.html
rename to src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_all.html
diff --git a/src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html b/src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one.html
rename to src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one.html
diff --git a/src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html b/src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one_cases_weekly.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
rename to src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one_cases_weekly.html
diff --git a/src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html b/src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one_deaths_weekly.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
rename to src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one_deaths_weekly.html
diff --git a/src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html b/src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one_notification_rate.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
rename to src/covid19/blueprints/ecdc/templates/europe/date_reported/ecdc_date_reported_one_notification_rate.html
diff --git a/src/covid19/blueprints/europe/templates/europe/europe_data.html b/src/covid19/blueprints/ecdc/templates/europe/ecdc_data.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/europe_data.html
rename to src/covid19/blueprints/ecdc/templates/europe/ecdc_data.html
diff --git a/src/covid19/blueprints/europe/templates/europe/europe_imported.html b/src/covid19/blueprints/ecdc/templates/europe/ecdc_imported.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/europe_imported.html
rename to src/covid19/blueprints/ecdc/templates/europe/ecdc_imported.html
diff --git a/src/covid19/blueprints/europe/templates/europe/europe_info.html b/src/covid19/blueprints/ecdc/templates/europe/ecdc_info.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/europe_info.html
rename to src/covid19/blueprints/ecdc/templates/europe/ecdc_info.html
diff --git a/src/covid19/blueprints/europe/templates/europe/europe_tasks.html b/src/covid19/blueprints/ecdc/templates/europe/ecdc_tasks.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/europe_tasks.html
rename to src/covid19/blueprints/ecdc/templates/europe/ecdc_tasks.html
diff --git a/src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html b/src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navbar_dropdown.html
rename to src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_navbar_dropdown.html
diff --git a/src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navtabs.html b/src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_navtabs.html
rename to src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_navtabs.html
diff --git a/src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_continent.html b/src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_continent.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_continent.html
rename to src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_continent.html
diff --git a/src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_country.html b/src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_country.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_country.html
rename to src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_country.html
diff --git a/src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html b/src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_data.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data.html
rename to src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_data.html
diff --git a/src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data_imported.html b/src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_data_imported.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_data_imported.html
rename to src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_data_imported.html
diff --git a/src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_date_reported.html b/src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_date_reported.html
similarity index 100%
rename from src/covid19/blueprints/europe/templates/europe/fragments/fragment_europe_table_date_reported.html
rename to src/covid19/blueprints/ecdc/templates/europe/fragments/fragment_ecdc_table_date_reported.html
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_model.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_model.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_model.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_model.py
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_model_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_model_import.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_model_import.py
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_service.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_service.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_service.py
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_service_config.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_service_config.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_service_download.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_service_download.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_service_import.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_service_update.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_service_update.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_views.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/vaccination_views.py
rename to src/covid19/blueprints/rki_vaccination/rki_vaccination_views.py