From edbaed132aac1567458c61420e927e904508a056 Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Fri, 12 Feb 2021 16:56:43 +0100 Subject: [PATCH] work --- src/covid19/blueprints/rki/landkreise/rki_views.py | 4 ++-- .../rki/{bundeslaender => rki_bundeslaender}/__init__.py | 0 .../rki/{bundeslaender => rki_bundeslaender}/rki_model.py | 0 .../rki_model_import.py | 0 .../rki/{bundeslaender => rki_bundeslaender}/rki_service.py | 6 +++--- .../rki_service_config.py | 0 .../rki_service_download.py | 0 .../rki_service_import.py | 0 .../rki_service_update.py | 4 ++-- .../rki/{bundeslaender => rki_bundeslaender}/rki_views.py | 4 ++-- .../templates/__init__.py | 0 .../templates/rki/fragment_rki_navbar_dropdown.html | 0 .../templates/rki/fragment_rki_navtabs.html | 0 .../templates/rki/rki_bundeslaender_imported.html | 0 .../templates/rki/rki_info.html | 0 .../templates/rki/rki_landkreise_imported.html | 0 .../templates/rki/rki_tasks.html | 0 src/covid19/blueprints/rki/rki_views.py | 4 ++-- 18 files changed, 11 insertions(+), 11 deletions(-) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/__init__.py (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_model.py (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_model_import.py (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_service.py (97%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_service_config.py (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_service_download.py (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_service_import.py (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_service_update.py (98%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/rki_views.py (97%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/templates/__init__.py (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/templates/rki/fragment_rki_navbar_dropdown.html (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/templates/rki/fragment_rki_navtabs.html (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/templates/rki/rki_bundeslaender_imported.html (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/templates/rki/rki_info.html (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/templates/rki/rki_landkreise_imported.html (100%) rename src/covid19/blueprints/rki/{bundeslaender => rki_bundeslaender}/templates/rki/rki_tasks.html (100%) diff --git a/src/covid19/blueprints/rki/landkreise/rki_views.py b/src/covid19/blueprints/rki/landkreise/rki_views.py index 713ad09e..157662be 100644 --- a/src/covid19/blueprints/rki/landkreise/rki_views.py +++ b/src/covid19/blueprints/rki/landkreise/rki_views.py @@ -7,8 +7,8 @@ from covid19.blueprints.rki.rki_model import RkiDateReported, RkiRegion, RkiCoun from covid19.blueprints.rki.landkreise.rki_model import RkiLandkreise from covid19.blueprints.rki.landkreise.rki_model_import import RkiBundeslaenderImport -from covid19.blueprints.rki.bundeslaender.rki_model import RkiBundeslaender -from covid19.blueprints.rki.bundeslaender.rki_model_import import RkiLandkreiseImport +from covid19.blueprints.rki.rki_bundeslaender.rki_model import RkiBundeslaender +from covid19.blueprints.rki.rki_bundeslaender.rki_model_import import RkiLandkreiseImport from covid19.blueprints.common.common_model_transient import ApplicationPage diff --git a/src/covid19/blueprints/rki/bundeslaender/__init__.py b/src/covid19/blueprints/rki/rki_bundeslaender/__init__.py similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/__init__.py rename to src/covid19/blueprints/rki/rki_bundeslaender/__init__.py diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_model.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_model.py similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/rki_model.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_model.py diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_model_import.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_model_import.py similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/rki_model_import.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_model_import.py diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_service.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_service.py similarity index 97% rename from src/covid19/blueprints/rki/bundeslaender/rki_service.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_service.py index 3a2dba21..01e56d09 100644 --- a/src/covid19/blueprints/rki/bundeslaender/rki_service.py +++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_service.py @@ -1,9 +1,9 @@ from flask import flash from database import app -from covid19.blueprints.rki.bundeslaender.rki_service_download import RkiBundeslaenderServiceDownload -from covid19.blueprints.rki.bundeslaender.rki_service_import import RkiBundeslaenderServiceImport -from covid19.blueprints.rki.bundeslaender.rki_service_update import RkiBundeslaenderServiceUpdate +from covid19.blueprints.rki.rki_bundeslaender.rki_service_download import RkiBundeslaenderServiceDownload +from covid19.blueprints.rki.rki_bundeslaender.rki_service_import import RkiBundeslaenderServiceImport +from covid19.blueprints.rki.rki_bundeslaender.rki_service_update import RkiBundeslaenderServiceUpdate # TODO: #123 split RkiService into two Services: RkiBundeslaenderService and RkiLandkreiseService diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_service_config.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_service_config.py similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/rki_service_config.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_service_config.py diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_service_download.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_service_download.py similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/rki_service_download.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_service_download.py diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_service_import.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_service_import.py similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/rki_service_import.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_service_import.py diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_service_update.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_service_update.py similarity index 98% rename from src/covid19/blueprints/rki/bundeslaender/rki_service_update.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_service_update.py index ace546c3..ef0ff9e0 100644 --- a/src/covid19/blueprints/rki/bundeslaender/rki_service_update.py +++ b/src/covid19/blueprints/rki/rki_bundeslaender/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.bundeslaender.rki_model import RkiBundeslaender -from covid19.blueprints.rki.bundeslaender.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 RkiBundeslaenderImport rki_service_update = None diff --git a/src/covid19/blueprints/rki/bundeslaender/rki_views.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_views.py similarity index 97% rename from src/covid19/blueprints/rki/bundeslaender/rki_views.py rename to src/covid19/blueprints/rki/rki_bundeslaender/rki_views.py index 713ad09e..157662be 100644 --- a/src/covid19/blueprints/rki/bundeslaender/rki_views.py +++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_views.py @@ -7,8 +7,8 @@ from covid19.blueprints.rki.rki_model import RkiDateReported, RkiRegion, RkiCoun from covid19.blueprints.rki.landkreise.rki_model import RkiLandkreise from covid19.blueprints.rki.landkreise.rki_model_import import RkiBundeslaenderImport -from covid19.blueprints.rki.bundeslaender.rki_model import RkiBundeslaender -from covid19.blueprints.rki.bundeslaender.rki_model_import import RkiLandkreiseImport +from covid19.blueprints.rki.rki_bundeslaender.rki_model import RkiBundeslaender +from covid19.blueprints.rki.rki_bundeslaender.rki_model_import import RkiLandkreiseImport from covid19.blueprints.common.common_model_transient import ApplicationPage diff --git a/src/covid19/blueprints/rki/bundeslaender/templates/__init__.py b/src/covid19/blueprints/rki/rki_bundeslaender/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/templates/__init__.py rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/__init__.py diff --git a/src/covid19/blueprints/rki/bundeslaender/templates/rki/fragment_rki_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/fragment_rki_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/templates/rki/fragment_rki_navbar_dropdown.html rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/fragment_rki_navbar_dropdown.html diff --git a/src/covid19/blueprints/rki/bundeslaender/templates/rki/fragment_rki_navtabs.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/fragment_rki_navtabs.html similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/templates/rki/fragment_rki_navtabs.html rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/fragment_rki_navtabs.html diff --git a/src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_bundeslaender_imported.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_bundeslaender_imported.html similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_bundeslaender_imported.html rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_bundeslaender_imported.html diff --git a/src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_info.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_info.html similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_info.html rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_info.html diff --git a/src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_landkreise_imported.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_landkreise_imported.html similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_landkreise_imported.html rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_landkreise_imported.html diff --git a/src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_tasks.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_tasks.html similarity index 100% rename from src/covid19/blueprints/rki/bundeslaender/templates/rki/rki_tasks.html rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki/rki_tasks.html diff --git a/src/covid19/blueprints/rki/rki_views.py b/src/covid19/blueprints/rki/rki_views.py index 713ad09e..157662be 100644 --- a/src/covid19/blueprints/rki/rki_views.py +++ b/src/covid19/blueprints/rki/rki_views.py @@ -7,8 +7,8 @@ from covid19.blueprints.rki.rki_model import RkiDateReported, RkiRegion, RkiCoun from covid19.blueprints.rki.landkreise.rki_model import RkiLandkreise from covid19.blueprints.rki.landkreise.rki_model_import import RkiBundeslaenderImport -from covid19.blueprints.rki.bundeslaender.rki_model import RkiBundeslaender -from covid19.blueprints.rki.bundeslaender.rki_model_import import RkiLandkreiseImport +from covid19.blueprints.rki.rki_bundeslaender.rki_model import RkiBundeslaender +from covid19.blueprints.rki.rki_bundeslaender.rki_model_import import RkiLandkreiseImport from covid19.blueprints.common.common_model_transient import ApplicationPage -- GitLab