diff --git a/docs/BACKLOG.md b/docs/BACKLOG.md
index 261c33cc570027b657814b994f5a5256dec5a7e5..2cf8797923331a631262f2c942b1a8b2493001d0 100644
--- a/docs/BACKLOG.md
+++ b/docs/BACKLOG.md
@@ -113,7 +113,7 @@
* Fixed #81 change tablename from who_global_data_import to who_import
* Fixed #84 rename tablename from who_global_data to who_data
* Fixed #85 rename WhoData to WhoData
-* Fixed #86 rename VaccinationDataXY to RkiVaccinationData
+* Fixed #86 rename VaccinationDataXY to VaccinationData
* Fixed #89 change tablename from vaccination_germany_timeline_import to vaccination_import
* Fixed #75 add Tasks to Europe Tasks Html
* Fixed #76 add Tasks to Vaccination Tasks Html
@@ -127,7 +127,7 @@
* -------------------------------------
* Fixed #88 rename VaccinationImport to VaccinationImport
* Fixed #89 change tablename from vaccination_germany_timeline_import to vaccination_import
-* Fixed #86 rename RkiVaccinationData to RkiVaccinationData
+* 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
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
index ff8de3a39177a72e9a8b83172b89e0871fc1e97a..fec1650aaf848637e09a678c2fa550bc5ebb058a 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_model.py
@@ -54,7 +54,7 @@ class VaccinationDateReported(BlueprintDateReported):
return oo
-class RkiVaccinationData(db.Model):
+class VaccinationData(db.Model):
__tablename__ = 'vaccination'
id = db.Column(db.Integer, primary_key=True)
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 50e4d93af9e039e08e9e89ae6078f5ae3b47a7c0..a461af3ee489ea15d8f24e096e875bd824b04b58 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service_update.py
@@ -2,7 +2,7 @@ from database import db, app
from flask_covid19.blueprints.app_all.all_config import BlueprintConfig
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 RkiVaccinationData
+from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationData
class RkiVaccinationServiceUpdateBase:
@@ -38,7 +38,7 @@ class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
def __full_update_fact_table(self):
app.logger.info(" __update_data_initial [begin]")
app.logger.info("------------------------------------------------------------")
- RkiVaccinationData.remove_all()
+ VaccinationData.remove_all()
result_date_rep = VaccinationImport.get_date_rep()
i = 0
for item_date_rep, in result_date_rep:
@@ -46,7 +46,7 @@ class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
d_datum=item_date_rep
)
for item_import in VaccinationImport.find_by_datum(d.date_reported_import_str):
- o = RkiVaccinationData(
+ o = VaccinationData(
date_reported=d,
dosen_kumulativ=item_import.dosen_kumulativ,
dosen_differenz_zum_vortag=item_import.dosen_differenz_zum_vortag,
@@ -84,7 +84,7 @@ class RkiVaccinationServiceUpdateFull(RkiVaccinationServiceUpdateBase):
return self
def full_update_dimension_tables(self):
- RkiVaccinationData.remove_all()
+ VaccinationData.remove_all()
self.__full_update_date_reported()
return self
@@ -125,7 +125,7 @@ class RkiVaccinationServiceUpdate(RkiVaccinationServiceUpdateBase):
for item_date_rep in result_date_rep:
date_reported = VaccinationDateReported.get_by_date_reported(item_date_rep)
for item_data_import in VaccinationImport.find_by_datum(item_date_rep):
- o = RkiVaccinationData(
+ o = VaccinationData(
date_reported=date_reported,
dosen_kumulativ=item_data_import.dosen_kumulativ,
dosen_differenz_zum_vortag=item_data_import.dosen_differenz_zum_vortag,
@@ -162,7 +162,7 @@ class RkiVaccinationServiceUpdate(RkiVaccinationServiceUpdateBase):
return self
def update_dimension_tables(self):
- RkiVaccinationData.remove_all()
+ VaccinationData.remove_all()
self.__update_date_reported()
return self
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
index cfec3fb938ec849935e7cfe4d2306e52bde5093d..e05d8621087841c6491069e2eec8da2a530a0d84 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_views.py
@@ -6,7 +6,7 @@ from flask_admin.contrib.sqla import ModelView
from database import admin, db, celery
from flask_covid19.blueprints.app_web.web_services import vaccination_service
-from flask_covid19.blueprints.data_vaccination.vaccination_model import RkiVaccinationData
+from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationData
from flask_covid19.blueprints.data_vaccination.vaccination_model import VaccinationDateReported
from flask_covid19.blueprints.data_vaccination.vaccination_model_import import VaccinationImport, VaccinationFlat
from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
@@ -17,7 +17,7 @@ app_vaccination = Blueprint('vaccination', __name__, template_folder='templates'
admin.add_view(ModelView(VaccinationImport, db.session, category="Vaccination"))
admin.add_view(ModelView(VaccinationFlat, db.session, category="Vaccination"))
admin.add_view(ModelView(VaccinationDateReported, db.session, category="Vaccination"))
-admin.add_view(ModelView(RkiVaccinationData, db.session, category="Vaccination"))
+admin.add_view(ModelView(VaccinationData, db.session, category="Vaccination"))
# ---------------------------------------------------------------------------------------------------------------
@@ -55,7 +55,7 @@ def url_vaccination_imported(page=1):
@app_vaccination.route('/data')
def url_vaccination_data(page=1):
page_info = WebPageContent('Vaccination', "Data: Germany Timeline")
- page_data = RkiVaccinationData.get_all_as_page(page)
+ page_data = VaccinationData.get_all_as_page(page)
return render_template(
'rki_vaccination/data/rki_vaccination_data.html',
page_data=page_data,