diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/rki_views.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_views.py index 157662be1535eb2ee0ee75c66881a9395c0bde86..5de1f4348e51cff0d68b565812828c7b0ee5dd17 100644 --- a/src/covid19/blueprints/rki/rki_bundeslaender/rki_views.py +++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_views.py @@ -4,8 +4,8 @@ from sqlalchemy.exc import OperationalError from database import app from covid19.blueprints.rki.rki_model import RkiDateReported, RkiRegion, RkiCountry -from covid19.blueprints.rki.landkreise.rki_model import RkiLandkreise -from covid19.blueprints.rki.landkreise.rki_model_import import RkiBundeslaenderImport +from covid19.blueprints.rki.rki_landkreise.rki_model import RkiLandkreise +from covid19.blueprints.rki.rki_landkreise.rki_model_import import RkiBundeslaenderImport from covid19.blueprints.rki.rki_bundeslaender.rki_model import RkiBundeslaender from covid19.blueprints.rki.rki_bundeslaender.rki_model_import import RkiLandkreiseImport diff --git a/src/covid19/blueprints/rki/landkreise/__init__.py b/src/covid19/blueprints/rki/rki_landkreise/__init__.py similarity index 100% rename from src/covid19/blueprints/rki/landkreise/__init__.py rename to src/covid19/blueprints/rki/rki_landkreise/__init__.py diff --git a/src/covid19/blueprints/rki/landkreise/rki_model.py b/src/covid19/blueprints/rki/rki_landkreise/rki_model.py similarity index 100% rename from src/covid19/blueprints/rki/landkreise/rki_model.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_model.py diff --git a/src/covid19/blueprints/rki/landkreise/rki_model_import.py b/src/covid19/blueprints/rki/rki_landkreise/rki_model_import.py similarity index 100% rename from src/covid19/blueprints/rki/landkreise/rki_model_import.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_model_import.py diff --git a/src/covid19/blueprints/rki/landkreise/rki_service.py b/src/covid19/blueprints/rki/rki_landkreise/rki_service.py similarity index 94% rename from src/covid19/blueprints/rki/landkreise/rki_service.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_service.py index ddbb05554d5494c4e00b48e4a22c244ac5eceb55..a3d4f0aaf6135b9da4942701d909466f44fa6c3c 100644 --- a/src/covid19/blueprints/rki/landkreise/rki_service.py +++ b/src/covid19/blueprints/rki/rki_landkreise/rki_service.py @@ -1,9 +1,9 @@ from flask import flash from database import app -from covid19.blueprints.rki.landkreise.rki_service_download import RkiLandkreiseServiceDownload -from covid19.blueprints.rki.landkreise.rki_service_import import RkiLandkreiseServiceImport -from covid19.blueprints.rki.landkreise.rki_service_update import RkiLandkreiseServiceUpdate +from covid19.blueprints.rki.rki_landkreise.rki_service_download import RkiLandkreiseServiceDownload +from covid19.blueprints.rki.rki_landkreise.rki_service_import import RkiLandkreiseServiceImport +from covid19.blueprints.rki.rki_landkreise.rki_service_update import RkiLandkreiseServiceUpdate # TODO: #123 split RkiService into two Services: RkiBundeslaenderService and RkiLandkreiseService diff --git a/src/covid19/blueprints/rki/landkreise/rki_service_config.py b/src/covid19/blueprints/rki/rki_landkreise/rki_service_config.py similarity index 100% rename from src/covid19/blueprints/rki/landkreise/rki_service_config.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_service_config.py diff --git a/src/covid19/blueprints/rki/landkreise/rki_service_download.py b/src/covid19/blueprints/rki/rki_landkreise/rki_service_download.py similarity index 100% rename from src/covid19/blueprints/rki/landkreise/rki_service_download.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_service_download.py diff --git a/src/covid19/blueprints/rki/landkreise/rki_service_import.py b/src/covid19/blueprints/rki/rki_landkreise/rki_service_import.py similarity index 100% rename from src/covid19/blueprints/rki/landkreise/rki_service_import.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_service_import.py diff --git a/src/covid19/blueprints/rki/landkreise/rki_service_update.py b/src/covid19/blueprints/rki/rki_landkreise/rki_service_update.py similarity index 98% rename from src/covid19/blueprints/rki/landkreise/rki_service_update.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_service_update.py index 5aa0fd034f188aadf4c5d462dd17b94965282566..e7189e130b52aa31fa98761c46b760e87693e73f 100644 --- a/src/covid19/blueprints/rki/landkreise/rki_service_update.py +++ b/src/covid19/blueprints/rki/rki_landkreise/rki_service_update.py @@ -1,8 +1,8 @@ from database import db, app from covid19.blueprints.rki.rki_model import RkiRegion, RkiDateReported, RkiCountry -from covid19.blueprints.rki.landkreise.rki_model import RkiLandkreise -from covid19.blueprints.rki.landkreise.rki_model_import import RkiLandkreiseImport +from covid19.blueprints.rki.rki_landkreise.rki_model import RkiLandkreise +from covid19.blueprints.rki.rki_landkreise.rki_model_import import RkiLandkreiseImport rki_service_update = None diff --git a/src/covid19/blueprints/rki/landkreise/rki_views.py b/src/covid19/blueprints/rki/rki_landkreise/rki_views.py similarity index 97% rename from src/covid19/blueprints/rki/landkreise/rki_views.py rename to src/covid19/blueprints/rki/rki_landkreise/rki_views.py index 157662be1535eb2ee0ee75c66881a9395c0bde86..5de1f4348e51cff0d68b565812828c7b0ee5dd17 100644 --- a/src/covid19/blueprints/rki/landkreise/rki_views.py +++ b/src/covid19/blueprints/rki/rki_landkreise/rki_views.py @@ -4,8 +4,8 @@ from sqlalchemy.exc import OperationalError from database import app from covid19.blueprints.rki.rki_model import RkiDateReported, RkiRegion, RkiCountry -from covid19.blueprints.rki.landkreise.rki_model import RkiLandkreise -from covid19.blueprints.rki.landkreise.rki_model_import import RkiBundeslaenderImport +from covid19.blueprints.rki.rki_landkreise.rki_model import RkiLandkreise +from covid19.blueprints.rki.rki_landkreise.rki_model_import import RkiBundeslaenderImport from covid19.blueprints.rki.rki_bundeslaender.rki_model import RkiBundeslaender from covid19.blueprints.rki.rki_bundeslaender.rki_model_import import RkiLandkreiseImport diff --git a/src/covid19/blueprints/rki/landkreise/templates/__init__.py b/src/covid19/blueprints/rki/rki_landkreise/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/rki/landkreise/templates/__init__.py rename to src/covid19/blueprints/rki/rki_landkreise/templates/__init__.py diff --git a/src/covid19/blueprints/rki/landkreise/templates/rki/fragment_rki_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki/fragment_rki_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/rki/landkreise/templates/rki/fragment_rki_navbar_dropdown.html rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki/fragment_rki_navbar_dropdown.html diff --git a/src/covid19/blueprints/rki/landkreise/templates/rki/fragment_rki_navtabs.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki/fragment_rki_navtabs.html similarity index 100% rename from src/covid19/blueprints/rki/landkreise/templates/rki/fragment_rki_navtabs.html rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki/fragment_rki_navtabs.html diff --git a/src/covid19/blueprints/rki/landkreise/templates/rki/rki_bundeslaender_imported.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_bundeslaender_imported.html similarity index 100% rename from src/covid19/blueprints/rki/landkreise/templates/rki/rki_bundeslaender_imported.html rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_bundeslaender_imported.html diff --git a/src/covid19/blueprints/rki/landkreise/templates/rki/rki_info.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_info.html similarity index 100% rename from src/covid19/blueprints/rki/landkreise/templates/rki/rki_info.html rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_info.html diff --git a/src/covid19/blueprints/rki/landkreise/templates/rki/rki_landkreise_imported.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_landkreise_imported.html similarity index 100% rename from src/covid19/blueprints/rki/landkreise/templates/rki/rki_landkreise_imported.html rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_landkreise_imported.html diff --git a/src/covid19/blueprints/rki/landkreise/templates/rki/rki_tasks.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_tasks.html similarity index 100% rename from src/covid19/blueprints/rki/landkreise/templates/rki/rki_tasks.html rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki/rki_tasks.html diff --git a/src/covid19/blueprints/rki/rki_views.py b/src/covid19/blueprints/rki/rki_views.py index 157662be1535eb2ee0ee75c66881a9395c0bde86..5de1f4348e51cff0d68b565812828c7b0ee5dd17 100644 --- a/src/covid19/blueprints/rki/rki_views.py +++ b/src/covid19/blueprints/rki/rki_views.py @@ -4,8 +4,8 @@ from sqlalchemy.exc import OperationalError from database import app from covid19.blueprints.rki.rki_model import RkiDateReported, RkiRegion, RkiCountry -from covid19.blueprints.rki.landkreise.rki_model import RkiLandkreise -from covid19.blueprints.rki.landkreise.rki_model_import import RkiBundeslaenderImport +from covid19.blueprints.rki.rki_landkreise.rki_model import RkiLandkreise +from covid19.blueprints.rki.rki_landkreise.rki_model_import import RkiBundeslaenderImport from covid19.blueprints.rki.rki_bundeslaender.rki_model import RkiBundeslaender from covid19.blueprints.rki.rki_bundeslaender.rki_model_import import RkiLandkreiseImport