diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py index 5437c8e9d8cc80e6b8dbd5dfbceec1312cbb7209..07d615c641f5a70dbf576c3a13dc0eacae1ab27e 100644 --- a/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py +++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py @@ -5,8 +5,7 @@ import os class RkiBundeslaenderServiceConfig: def __init__(self): self.limit_nr = 20 - datum_heute = date.today().isoformat() - self.cvsfile_name = "RKI_COVID19__" + datum_heute + "__bundeslaender.csv" + self.data_path = ".."+os.sep+".."+os.sep+"data" self.url_src = "https://opendata.arcgis.com/datasets/ef4b445a53c1406892257fe63129a8ea_0.csv" - self.data_path = ".." + os.sep + ".." + os.sep + "data" + os.sep + self.cvsfile_name = "RKI_COVID19__" + date.today().isoformat() + "__bundeslaender.csv" self.src_cvsfile_path = self.data_path + self.cvsfile_name diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_config.py b/src/covid19/blueprints/rki_landkreise/rki_service_config.py index 8c2b5191f81c535d276bb202236afa54e001b75b..76554d169545373a9fc0b4a100e7fb6763f60b2c 100644 --- a/src/covid19/blueprints/rki_landkreise/rki_service_config.py +++ b/src/covid19/blueprints/rki_landkreise/rki_service_config.py @@ -5,8 +5,7 @@ import os class RkiLandkreiseServiceConfig: def __init__(self): self.limit_nr = 20 - datum_heute = date.today().isoformat() - self.cvsfile_name = "RKI_COVID19__" + datum_heute + "__landkreise.csv" + self.data_path = ".."+os.sep+".."+os.sep+"data" self.url_src = "https://opendata.arcgis.com/datasets/917fc37a709542548cc3be077a786c17_0.csv" - self.data_path = ".." + os.sep + ".." + os.sep + "data" + os.sep + self.cvsfile_name = "RKI_COVID19__" + date.today().isoformat() + "__landkreise.csv" self.src_cvsfile_path = self.data_path + self.cvsfile_name diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_import.py b/src/covid19/blueprints/rki_landkreise/rki_service_import.py index 1c62ed0494d1db8aca8a9fe7b6933665dfbdf8a9..639dd17611af998be8e8c613e1f3e09d51eaffcf 100644 --- a/src/covid19/blueprints/rki_landkreise/rki_service_import.py +++ b/src/covid19/blueprints/rki_landkreise/rki_service_import.py @@ -37,14 +37,53 @@ class RkiLandkreiseServiceImport: for row in file_reader: # TODO: #140 move WhoImport to RKI in: rk_service_import.py o = RkiLandkreiseImport( - date_reported=row[keyDate_reported], - country_code=row['Country_code'], - country=row['Country'], - who_region=row['WHO_region'], - new_cases=row['New_cases'], - cumulative_cases=row['Cumulative_cases'], - new_deaths=row['New_deaths'], - cumulative_deaths=row['Cumulative_deaths'] + OBJECTID=row['OBJECTID'], + ADE=row['ADE'], + GF=row['GF'], + BSG=row['BSG'], + RS=row['RS'], + AGS=row['AGS'], + SDV_RS=row['SDV_RS'], + GEN=row['GEN'], + BEZ=row['BEZ'], + IBZ=row['IBZ'], + BEM=row['BEM'], + NBD=row['NBD'], + SN_L=row['SN_L'], + SN_R=row['SN_R'], + SN_K=row['SN_K'], + SN_V1=row['SN_V1'], + SN_V2=row['SN_V2'], + SN_G=row['SN_G'], + FK_S3=row['FK_S3'], + NUTS=row['NUTS'], + RS_0=row['RS_0'], + AGS_0=row['AGS_0'], + WSK=row['WSK'], + EWZ=row['EWZ'], + KFL=row['KFL'], + DEBKG_ID=row['DEBKG_ID'], + death_rate=row['death_rate'], + cases=row['cases'], + deaths=row['deaths'], + cases_per_100k=row['cases_per_100k'], + cases_per_population=row['cases_per_population'], + BL=row['BL'], + BL_ID=row['BL_ID'], + county=row['county'], + last_update=row['last_update'], + cases7_per_100k=row['cases7_per_100k'], + recovered=row['recovered'], + EWZ_BL=row['EWZ_BL'], + cases7_bl_per_100k=row['cases7_bl_per_100k'], + cases7_bl=row['cases7_bl'], + death7_bl=row['death7_bl'], + cases7_lk=row['cases7_lk'], + death7_lk=row['death7_lk'], + cases7_per_100k_txt=row['cases7_per_100k_txt'], + AdmUnitId=row['AdmUnitId'], + SHAPE_Length=row['SHAPE_Length'], + SHAPE_Area=row['SHAPE_Area'], ) db.session.add(o) if (k % 2000) == 0: