diff --git a/src/flask_covid19/blueprints/app_web/web_model_factory.py b/src/flask_covid19/blueprints/app_web/web_model_factory.py index 76d8d8ff9dcaa25c1d5d150f9c74e24bdf960b7d..683e5e7ef08f090be34fc275d8aec61a8d801ed3 100644 --- a/src/flask_covid19/blueprints/app_web/web_model_factory.py +++ b/src/flask_covid19/blueprints/app_web/web_model_factory.py @@ -51,6 +51,17 @@ class BlueprintDateReportedFactory: datum_parts = (my_year, my_month, my_day) return datum_parts + @classmethod + def __get_datetime_german_parts(cls, my_datetime: str): + my_datetime_parts = my_datetime.split(",") + my_date_rep = my_datetime_parts[0] + my_date_parts = my_date_rep.split('.') + my_day = int(my_date_parts[0]) + my_month = int(my_date_parts[1]) + my_year = int(my_date_parts[2]) + datum_parts = (my_year, my_month, my_day) + return datum_parts + @classmethod def __get_datum_parts(cls, my_date_rep: str): my_date_parts = my_date_rep.split("-") @@ -264,7 +275,7 @@ class BlueprintDateReportedFactory: @classmethod def create_new_object_for_rki_date_datenstand(cls, my_date_rep: str): - (my_year, my_month, my_day) = cls.__get_datetime_parts(my_date_rep) + (my_year, my_month, my_day) = cls.__get_datetime_german_parts(my_datetime=my_date_rep) my_datum = date(my_year, my_month, my_day) o = cls.__create_new_object_factory(date_reported_import_str=my_date_rep, my_datum=my_datum) return cls.__get_rki_date_datenstand(o) diff --git a/src/flask_covid19/blueprints/data_rki/rki_model.py b/src/flask_covid19/blueprints/data_rki/rki_model.py index 755564f8cc619b88fdd47ffcce45f2e59e93fc27..4e9e7a6c66b82e1c2c150a17ca0ed90a7a242f39 100644 --- a/src/flask_covid19/blueprints/data_rki/rki_model.py +++ b/src/flask_covid19/blueprints/data_rki/rki_model.py @@ -172,6 +172,9 @@ class RkiAltersgruppe(BlueprintEntity): __tablename__ = 'rki_altersgruppe' __mapper_args__ = {'concrete': True} + def __str__(self): + return " " + self.altersgruppe + " " + id = db.Column(db.Integer, primary_key=True) processed_update = db.Column(db.Boolean, nullable=False) processed_full_update = db.Column(db.Boolean, nullable=False) 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 03693a4ba4cc2d5a88991b5bff6431bcda2ed3bc..5de88b7f16549b19676c9da071c149bdb9cb5631 100644 --- a/src/flask_covid19/blueprints/data_rki/rki_service_update.py +++ b/src/flask_covid19/blueprints/data_rki/rki_service_update.py @@ -82,7 +82,7 @@ class RkiServiceUpdateFull(RkiServiceUpdateBase): def __full_update_altersgruppe(self): app.logger.info(" RkiServiceUpdateFull.__full_update_altersgruppe [begin]") app.logger.info("------------------------------------------------------------") - RkiBundesland.remove_all() + RkiAltersgruppe.remove_all() app.logger.info("") i = 0 output_lines = []