From c7288bad61ceb471041ce396927df6778cd94914 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 25 May 2021 18:06:06 +0200
Subject: [PATCH] Refactoring: vaccination
---
src/flask_covid19/blueprints/app_admin/__init__.py | 0
.../blueprints/app_admin/templates/__init__.py | 0
src/flask_covid19/blueprints/app_mq/__init__.py | 0
.../blueprints/app_mq/application_workers.py | 1 -
src/flask_covid19/blueprints/app_user/__init__.py | 0
.../blueprints/app_user/templates/__init__.py | 0
.../{all_model_factory.py => web_model_factory.py} | 0
.../blueprints/app_web/web_model_transient.py | 9 +++++----
.../blueprints/data_divi/divi_service_import.py | 1 -
.../blueprints/data_divi/divi_service_update.py | 2 +-
.../blueprints/data_divi/divi_test_views.py | 3 ++-
.../blueprints/data_ecdc/ecdc_service_import.py | 2 +-
.../blueprints/data_ecdc/ecdc_service_update.py | 2 +-
.../blueprints/data_owid/owid_service_import.py | 2 +-
.../blueprints/data_owid/owid_service_update.py | 2 +-
.../blueprints/data_rki/rki_service_import.py | 2 +-
.../blueprints/data_rki/rki_service_update.py | 2 +-
.../data_vaccination/vaccination_service_import.py | 2 +-
.../data_vaccination/vaccination_service_update.py | 2 +-
.../blueprints/data_who/who_service_import.py | 2 +-
.../blueprints/data_who/who_service_update.py | 2 +-
21 files changed, 18 insertions(+), 18 deletions(-)
delete mode 100644 src/flask_covid19/blueprints/app_admin/__init__.py
delete mode 100644 src/flask_covid19/blueprints/app_admin/templates/__init__.py
delete mode 100644 src/flask_covid19/blueprints/app_mq/__init__.py
delete mode 100644 src/flask_covid19/blueprints/app_mq/application_workers.py
delete mode 100644 src/flask_covid19/blueprints/app_user/__init__.py
delete mode 100644 src/flask_covid19/blueprints/app_user/templates/__init__.py
rename src/flask_covid19/blueprints/app_web/{all_model_factory.py => web_model_factory.py} (100%)
diff --git a/src/flask_covid19/blueprints/app_admin/__init__.py b/src/flask_covid19/blueprints/app_admin/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/flask_covid19/blueprints/app_admin/templates/__init__.py b/src/flask_covid19/blueprints/app_admin/templates/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/flask_covid19/blueprints/app_mq/__init__.py b/src/flask_covid19/blueprints/app_mq/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/flask_covid19/blueprints/app_mq/application_workers.py b/src/flask_covid19/blueprints/app_mq/application_workers.py
deleted file mode 100644
index 8b137891..00000000
--- a/src/flask_covid19/blueprints/app_mq/application_workers.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/flask_covid19/blueprints/app_user/__init__.py b/src/flask_covid19/blueprints/app_user/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/flask_covid19/blueprints/app_user/templates/__init__.py b/src/flask_covid19/blueprints/app_user/templates/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/flask_covid19/blueprints/app_web/all_model_factory.py b/src/flask_covid19/blueprints/app_web/web_model_factory.py
similarity index 100%
rename from src/flask_covid19/blueprints/app_web/all_model_factory.py
rename to src/flask_covid19/blueprints/app_web/web_model_factory.py
diff --git a/src/flask_covid19/blueprints/app_web/web_model_transient.py b/src/flask_covid19/blueprints/app_web/web_model_transient.py
index 8b6eca67..df457b1d 100644
--- a/src/flask_covid19/blueprints/app_web/web_model_transient.py
+++ b/src/flask_covid19/blueprints/app_web/web_model_transient.py
@@ -5,8 +5,9 @@ class WebPageContent:
self.subtitle = default_subtitle
self.subtitle_info = default_subtitle_info
if self.subtitle is None:
- self.subtitle = """This is a simple hero unit, a simple jumbotron-style component
- for calling extra attention to featured content or information."""
+ self.subtitle = """Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam."""
if self.subtitle_info is None:
- self.subtitle_info = """It uses utility classes for typography and spacing
- to space content out within the larger container."""
\ No newline at end of file
+ self.subtitle_info = """Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
+ tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et
+ justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum
+ dolor sit amet."""
\ No newline at end of file
diff --git a/src/flask_covid19/blueprints/data_divi/divi_service_import.py b/src/flask_covid19/blueprints/data_divi/divi_service_import.py
index 55b14a07..29c7a6b0 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_service_import.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_service_import.py
@@ -4,7 +4,6 @@ import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_divi.divi_model_import import DiviImport
diff --git a/src/flask_covid19/blueprints/data_divi/divi_service_update.py b/src/flask_covid19/blueprints/data_divi/divi_service_update.py
index eaafd48e..80d5ea4f 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_service_update.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_divi.divi_model import DiviRegion, DiviDateReported, DiviCountry, DiviData
from flask_covid19.blueprints.data_divi.divi_model_import import DiviImport
diff --git a/src/flask_covid19/blueprints/data_divi/divi_test_views.py b/src/flask_covid19/blueprints/data_divi/divi_test_views.py
index 2a249329..a3ab6af8 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_test_views.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_test_views.py
@@ -38,7 +38,8 @@ def url_divi_test_divi_import_countries():
i = 0
for c in DiviImport.countries():
i += 1
- line = " | " + str(i) + " | " + c.countries.country_code + " | " + c.countries.country + " | " + c.countries.divi_region + " | "
+ line = " | " + str(i) + " | " + c.countries.country_code + " | " + c.countries.country + " | " \
+ + c.countries.divi_region + " | "
app.logger.info(line)
flash("url_divi_mytest - DONE: DiviImport.countries()")
return redirect(url_for('divi_test.url_divi_test_tests'))
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py
index a39a00f5..bfd5bb0b 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_service_import.py
@@ -4,7 +4,7 @@ import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
from flask_covid19.blueprints.data_ecdc.ecdc_model import EcdcDateReported
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_ecdc.ecdc_model_import import EcdcImport, EcdcFlat
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_service_update.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_service_update.py
index 2242bf7e..ae73041c 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_service_update.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
from flask_covid19.blueprints.data_ecdc.ecdc_model_import import EcdcImport
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
diff --git a/src/flask_covid19/blueprints/data_owid/owid_service_import.py b/src/flask_covid19/blueprints/data_owid/owid_service_import.py
index dbeebabd..5354f257 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_service_import.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_service_import.py
@@ -4,7 +4,7 @@ from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
from flask_covid19.blueprints.data_owid.owid_model import OwidDateReported
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_owid.owid_model_import import OwidImport, OwidFlat
diff --git a/src/flask_covid19/blueprints/data_owid/owid_service_update.py b/src/flask_covid19/blueprints/data_owid/owid_service_update.py
index b05e65db..e2a40bff 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_service_update.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_service_update.py
@@ -1,6 +1,6 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
from flask_covid19.blueprints.data_owid.owid_model_import import OwidImport
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service_import.py b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
index 3388d1b4..d3d4d84f 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_import.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
@@ -3,7 +3,7 @@ import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_rki.rki_model import RkiMeldedatum
from flask_covid19.blueprints.data_rki.rki_model_import import RkiImport, RkiFlat
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service_update.py b/src/flask_covid19/blueprints/data_rki/rki_service_update.py
index a7d966f8..efa2abec 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_update.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_rki.rki_model import RkiData, RkiMeldedatum, RkiBundesland, RkiLandkreis
from flask_covid19.blueprints.data_rki.rki_model_import import RkiImport
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
index a8fa7cf8..733ff6b9 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_import.py
@@ -4,7 +4,7 @@ import psycopg2
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationDateReported
from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport, VaccinationFlat
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
index 87f711a4..c1bfab6e 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
@@ -1,6 +1,6 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport
from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationDateReported
from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationData
diff --git a/src/flask_covid19/blueprints/data_who/who_service_import.py b/src/flask_covid19/blueprints/data_who/who_service_import.py
index ca00c01b..60386bca 100644
--- a/src/flask_covid19/blueprints/data_who/who_service_import.py
+++ b/src/flask_covid19/blueprints/data_who/who_service_import.py
@@ -2,7 +2,7 @@ import sys
import csv
import psycopg2
from database import db, app
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
from flask_covid19.blueprints.data_who.who_model import WhoDateReported
from flask_covid19.blueprints.data_who.who_model_import import WhoImport, WhoFlat
diff --git a/src/flask_covid19/blueprints/data_who/who_service_update.py b/src/flask_covid19/blueprints/data_who/who_service_update.py
index 0d0d5b2a..9ef327be 100644
--- a/src/flask_covid19/blueprints/data_who/who_service_update.py
+++ b/src/flask_covid19/blueprints/data_who/who_service_update.py
@@ -1,6 +1,6 @@
from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
-from flask_covid19.blueprints.app_web.all_model_factory import BlueprintDateReportedFactory
+from flask_covid19.blueprints.app_web.web_model_factory import BlueprintDateReportedFactory
from flask_covid19.blueprints.data_who.who_model import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData
from flask_covid19.blueprints.data_who.who_model_import import WhoImport
--
GitLab