From 13217ba0756638204dda35a29185fc3c1e0558fe Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Sat, 13 Feb 2021 14:02:47 +0100 Subject: [PATCH] ## 0.0.15 Release * ------------------------------------- * Fixed #88 rename VaccinationImport to VaccinationImport * Fixed #89 change tablename from vaccination_germany_timeline_import to vaccination_import * Fixed #86 rename VaccinationData to VaccinationData * Fixed #162 rename table vaccination_germany_timeline into vaccination_data * ------------------------------------- * Fixed #170 implement url_vaccination_task_update_star_schema_initial in vaccination_views.py * Fixed #171 implement url_vaccination_task_update_starschema_incremental in vaccination_views.py * Fixed #172 implement url_vaccination_task_import_only in vaccination_views.py * Fixed #173 implement url_vaccination_task_import_only in vaccination_views.py * Fixed #174 implement url_vaccination_task_update_dimensiontables_only in vaccination_views.py * Fixed #175 implement url_vaccination_task_update_facttable_incremental_only in vaccination_views.py * Fixed #176 implement url_vaccination_task_update_facttable_initial_only in vaccination_views.py * ------------------------------------- * Fixed #91 implement VaccinationService.run_download_only * Fixed #92 implement VaccinationService.run_import_only * Fixed #93 implement VaccinationService.run_update_dimension_tables_only * Fixed #94 implement VaccinationService.run_update_fact_table_incremental_only * Fixed #95 implement VaccinationService.run_update_fact_table_initial_only * Fixed #96 implement VaccinationService.run_update_star_schema_incremental * Fixed #97 implement VaccinationService.run_update_star_schema_initial * Fixed #101 implement VaccinationServiceUpdate.update_dimension_tables_only * Fixed #102 implement VaccinationServiceUpdate.update_fact_table_incremental_only * Fixed #103 implement VaccinationServiceUpdate.update_fact_table_initial_only * Fixed #104 implement VaccinationServiceUpdate.update_star_schema_incremental * Fixed #105 implement VaccinationServiceUpdate.update_star_schema_initial * ------------------------------------- * Fixed #90 refactor VaccinationService to new method scheme introduced 07.02.2021 * Fixed #98 refactor VaccinationServiceDownload to new method scheme introduced 07.02.2021 * Fixed #99 refactor VaccinationServiceImport to new method scheme introduced 07.02.2021 * Fixed #100 refactor VaccinationServiceUpdate to new method scheme introduced 07.02.2021 * ------------------------------------- * Fixed #87 change to: Vaccination.datum many to one VaccinationDateReported * Fixed #106 add Tasks and URLs for starting Tasks to vaccination_views * ------------------------------------- --- src/covid19/app_services.py | 2 +- src/covid19/app_views.py | 4 ++-- .../{vaccination => rki_vaccination}/__init__.py | 0 .../templates/__init__.py | 0 .../fragments/fragment_vaccination_navbar_dropdown.html | 0 .../fragments/fragment_vaccination_navtabs.html | 0 .../fragment_vaccination_timeline_germany_table.html | 0 .../fragment_vaccination_timeline_germany_table_head.html | 0 .../templates/vaccination/vaccination_data.html | 0 .../templates/vaccination/vaccination_import.html | 0 .../templates/vaccination/vaccination_info.html | 0 .../templates/vaccination/vaccination_tasks.html | 0 .../{vaccination => rki_vaccination}/vaccination_model.py | 0 .../vaccination_model_import.py | 0 .../vaccination_service.py | 8 ++++---- .../vaccination_service_config.py | 0 .../vaccination_service_download.py | 2 +- .../vaccination_service_import.py | 4 ++-- .../vaccination_service_update.py | 6 +++--- .../{vaccination => rki_vaccination}/vaccination_views.py | 4 ++-- 20 files changed, 15 insertions(+), 15 deletions(-) rename src/covid19/blueprints/{vaccination => rki_vaccination}/__init__.py (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/__init__.py (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/fragments/fragment_vaccination_navtabs.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/vaccination_data.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/vaccination_import.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/vaccination_info.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/templates/vaccination/vaccination_tasks.html (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_model.py (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_model_import.py (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_service.py (88%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_service_config.py (100%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_service_download.py (96%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_service_import.py (95%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_service_update.py (97%) rename src/covid19/blueprints/{vaccination => rki_vaccination}/vaccination_views.py (97%) diff --git a/src/covid19/app_services.py b/src/covid19/app_services.py index c7c2d903..01de940e 100644 --- a/src/covid19/app_services.py +++ b/src/covid19/app_services.py @@ -5,7 +5,7 @@ from covid19.blueprints.who.who_service import WhoService from covid19.blueprints.europe.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.vaccination.vaccination_service import VaccinationService +from covid19.blueprints.rki_vaccination.vaccination_service import VaccinationService from covid19.blueprints.admin.admin_service import AdminService ############################################################################################ diff --git a/src/covid19/app_views.py b/src/covid19/app_views.py index edfd0831..1a6a38e7 100644 --- a/src/covid19/app_views.py +++ b/src/covid19/app_views.py @@ -4,14 +4,14 @@ from covid19.blueprints.common.common_model_transient import ApplicationPage import covid19.blueprints.who.who_views import covid19.blueprints.europe.europe_views -import covid19.blueprints.vaccination.vaccination_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 from covid19.blueprints.who.who_views import app_who from covid19.blueprints.europe.europe_views import app_europe -from covid19.blueprints.vaccination.vaccination_views import app_vaccination +from covid19.blueprints.rki_vaccination.vaccination_views import app_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 diff --git a/src/covid19/blueprints/vaccination/__init__.py b/src/covid19/blueprints/rki_vaccination/__init__.py similarity index 100% rename from src/covid19/blueprints/vaccination/__init__.py rename to src/covid19/blueprints/rki_vaccination/__init__.py diff --git a/src/covid19/blueprints/vaccination/templates/__init__.py b/src/covid19/blueprints/rki_vaccination/templates/__init__.py similarity index 100% rename from src/covid19/blueprints/vaccination/templates/__init__.py rename to src/covid19/blueprints/rki_vaccination/templates/__init__.py diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_navtabs.html diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/vaccination_data.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_data.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/vaccination_data.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_data.html diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/vaccination_import.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_import.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/vaccination_import.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_import.html diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_info.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/vaccination_info.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_info.html diff --git a/src/covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html b/src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_tasks.html similarity index 100% rename from src/covid19/blueprints/vaccination/templates/vaccination/vaccination_tasks.html rename to src/covid19/blueprints/rki_vaccination/templates/vaccination/vaccination_tasks.html diff --git a/src/covid19/blueprints/vaccination/vaccination_model.py b/src/covid19/blueprints/rki_vaccination/vaccination_model.py similarity index 100% rename from src/covid19/blueprints/vaccination/vaccination_model.py rename to src/covid19/blueprints/rki_vaccination/vaccination_model.py diff --git a/src/covid19/blueprints/vaccination/vaccination_model_import.py b/src/covid19/blueprints/rki_vaccination/vaccination_model_import.py similarity index 100% rename from src/covid19/blueprints/vaccination/vaccination_model_import.py rename to src/covid19/blueprints/rki_vaccination/vaccination_model_import.py diff --git a/src/covid19/blueprints/vaccination/vaccination_service.py b/src/covid19/blueprints/rki_vaccination/vaccination_service.py similarity index 88% rename from src/covid19/blueprints/vaccination/vaccination_service.py rename to src/covid19/blueprints/rki_vaccination/vaccination_service.py index 72ce5b4a..cd578097 100644 --- a/src/covid19/blueprints/vaccination/vaccination_service.py +++ b/src/covid19/blueprints/rki_vaccination/vaccination_service.py @@ -1,10 +1,10 @@ from flask import flash from database import app -from covid19.blueprints.vaccination.vaccination_service_download import VaccinationServiceDownload -from covid19.blueprints.vaccination.vaccination_service_import import VaccinationServiceImport -from covid19.blueprints.vaccination.vaccination_service_config import VaccinationServiceConfig -from covid19.blueprints.vaccination.vaccination_service_update import VaccinationServiceUpdate +from covid19.blueprints.rki_vaccination.vaccination_service_download import VaccinationServiceDownload +from covid19.blueprints.rki_vaccination.vaccination_service_import import VaccinationServiceImport +from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig +from covid19.blueprints.rki_vaccination.vaccination_service_update import VaccinationServiceUpdate class VaccinationService: diff --git a/src/covid19/blueprints/vaccination/vaccination_service_config.py b/src/covid19/blueprints/rki_vaccination/vaccination_service_config.py similarity index 100% rename from src/covid19/blueprints/vaccination/vaccination_service_config.py rename to src/covid19/blueprints/rki_vaccination/vaccination_service_config.py diff --git a/src/covid19/blueprints/vaccination/vaccination_service_download.py b/src/covid19/blueprints/rki_vaccination/vaccination_service_download.py similarity index 96% rename from src/covid19/blueprints/vaccination/vaccination_service_download.py rename to src/covid19/blueprints/rki_vaccination/vaccination_service_download.py index 71cd8f10..7700beee 100644 --- a/src/covid19/blueprints/vaccination/vaccination_service_download.py +++ b/src/covid19/blueprints/rki_vaccination/vaccination_service_download.py @@ -2,7 +2,7 @@ import os import wget from flask import flash from database import app -from covid19.blueprints.vaccination.vaccination_service_config import VaccinationServiceConfig +from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig class VaccinationServiceDownload: diff --git a/src/covid19/blueprints/vaccination/vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/vaccination_service_import.py similarity index 95% rename from src/covid19/blueprints/vaccination/vaccination_service_import.py rename to src/covid19/blueprints/rki_vaccination/vaccination_service_import.py index 2138c177..6a5be585 100644 --- a/src/covid19/blueprints/vaccination/vaccination_service_import.py +++ b/src/covid19/blueprints/rki_vaccination/vaccination_service_import.py @@ -3,8 +3,8 @@ import csv import psycopg2 from database import db, app -from covid19.blueprints.vaccination.vaccination_model_import import VaccinationImport -from covid19.blueprints.vaccination.vaccination_service_config import VaccinationServiceConfig +from covid19.blueprints.rki_vaccination.vaccination_model_import import VaccinationImport +from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig class VaccinationServiceImport: diff --git a/src/covid19/blueprints/vaccination/vaccination_service_update.py b/src/covid19/blueprints/rki_vaccination/vaccination_service_update.py similarity index 97% rename from src/covid19/blueprints/vaccination/vaccination_service_update.py rename to src/covid19/blueprints/rki_vaccination/vaccination_service_update.py index c52ac751..c5005fc4 100644 --- a/src/covid19/blueprints/vaccination/vaccination_service_update.py +++ b/src/covid19/blueprints/rki_vaccination/vaccination_service_update.py @@ -1,8 +1,8 @@ from database import db, app -from covid19.blueprints.vaccination.vaccination_service_config import VaccinationServiceConfig -from covid19.blueprints.vaccination.vaccination_model_import import VaccinationImport -from covid19.blueprints.vaccination.vaccination_model import VaccinationDateReported, VaccinationData +from covid19.blueprints.rki_vaccination.vaccination_service_config import VaccinationServiceConfig +from covid19.blueprints.rki_vaccination.vaccination_model_import import VaccinationImport +from covid19.blueprints.rki_vaccination.vaccination_model import VaccinationDateReported, VaccinationData class VaccinationServiceUpdate: diff --git a/src/covid19/blueprints/vaccination/vaccination_views.py b/src/covid19/blueprints/rki_vaccination/vaccination_views.py similarity index 97% rename from src/covid19/blueprints/vaccination/vaccination_views.py rename to src/covid19/blueprints/rki_vaccination/vaccination_views.py index f5aa26c6..8e425e44 100644 --- a/src/covid19/blueprints/vaccination/vaccination_views.py +++ b/src/covid19/blueprints/rki_vaccination/vaccination_views.py @@ -6,8 +6,8 @@ from database import app from covid19.services import vaccination_service from covid19.workers import celery -from covid19.blueprints.vaccination.vaccination_model import VaccinationData, VaccinationDateReported -from covid19.blueprints.vaccination.vaccination_model_import import VaccinationImport +from covid19.blueprints.rki_vaccination.vaccination_model import VaccinationData, VaccinationDateReported +from covid19.blueprints.rki_vaccination.vaccination_model_import import VaccinationImport from covid19.blueprints.common.common_model_transient import ApplicationPage -- GitLab