From 806ce7baafa936425f971ce5988e35df689a5c0b Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 18 May 2021 00:59:31 +0200
Subject: [PATCH] work
---
.../blueprints/ecdc/ecdc_service_import.py | 20 +++++++++----------
.../blueprints/owid/owid_service_import.py | 16 +++++++--------
src/covid19/blueprints/owid/owid_views.py | 2 +-
.../rki_cases/rki_service_import.py | 4 ++--
src/covid19/blueprints/rki_cases/rki_views.py | 4 ++--
.../rki_vaccination_service_import.py | 14 ++++++-------
.../rki_vaccination_tasks.html | 8 ++++----
7 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_import.py b/src/covid19/blueprints/ecdc/ecdc_service_import.py
index 6c19fca0..7e3928e9 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_import.py
@@ -32,9 +32,9 @@ class EcdcServiceImport:
d = EcdcDateReported.create_new_object_factory(my_date_rep=date_rep)
o = EcdcImport(
date_rep=date_rep,
- date_rep_day=row['day'],
- date_rep_month=row['month'],
- date_rep_year=row['year'],
+ day=row['day'],
+ month=row['month'],
+ year=row['year'],
cases=row['cases'],
deaths=row['deaths'],
countries_and_territories=row['countriesAndTerritories'],
@@ -44,13 +44,13 @@ class EcdcServiceImport:
continent_exp=row['continentExp'],
cumulative_number_for_14_days_of_covid19_cases_per_100000
=row['Cumulative_number_for_14_days_of_COVID-19_cases_per_100000'],
- datum=d.datum,
- year=d.year,
- month=d.month,
- day_of_month=d.day_of_month,
- day_of_week=d.day_of_week,
- week_of_year=d.day_of_week,
- year_week=d.year_week
+ # datum=d.datum,
+ # year=d.year,
+ # month=d.month,
+ # day_of_month=d.day_of_month,
+ # day_of_week=d.day_of_week,
+ # week_of_year=d.day_of_week,
+ # year_week=d.year_week
)
db.session.add(o)
k = k + 1
diff --git a/src/covid19/blueprints/owid/owid_service_import.py b/src/covid19/blueprints/owid/owid_service_import.py
index 2201e963..fe750822 100644
--- a/src/covid19/blueprints/owid/owid_service_import.py
+++ b/src/covid19/blueprints/owid/owid_service_import.py
@@ -89,14 +89,14 @@ class OwidServiceImport:
handwashing_facilities=row['handwashing_facilities'],
hospital_beds_per_thousand=row['hospital_beds_per_thousand'],
life_expectancy=row['life_expectancy'],
- human_development_index=row['human_development_index'],
- datum=d.datum,
- year=d.year,
- month=d.month,
- day_of_month=d.day_of_month,
- day_of_week=d.day_of_week,
- week_of_year=d.day_of_week,
- year_week=d.year_week
+ human_development_index=row['human_development_index'] #,
+ # datum=d.datum,
+ # year=d.year,
+ # month=d.month,
+ # day_of_month=d.day_of_month,
+ # day_of_week=d.day_of_week,
+ # week_of_year=d.day_of_week,
+ # year_week=d.year_week
)
db.session.add(o)
k += 1
diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py
index cf5c4c8d..f7be3d42 100644
--- a/src/covid19/blueprints/owid/owid_views.py
+++ b/src/covid19/blueprints/owid/owid_views.py
@@ -552,7 +552,7 @@ def task_owid_update_star_schema(self):
@app_owid.route('/task/download/only')
def url_task_owid_download():
app.logger.info("url_owid_task_download_only [start]")
- owid_service.run_download_only()
+ owid_service.download_all_files()
flash("owid_service.run_download_only ok")
app.logger.info("url_owid_task_download_only [done]")
return redirect(url_for('owid.url_owid_tasks'))
diff --git a/src/covid19/blueprints/rki_cases/rki_service_import.py b/src/covid19/blueprints/rki_cases/rki_service_import.py
index ae57a588..71702ab9 100644
--- a/src/covid19/blueprints/rki_cases/rki_service_import.py
+++ b/src/covid19/blueprints/rki_cases/rki_service_import.py
@@ -53,9 +53,9 @@ class RkiServiceImport:
db.session.add(o)
if (k % 2000) == 0:
db.session.commit()
- app.logger.info(" import RKI Bundeslaender ... " + str(k) + " rows")
+ app.logger.info(" import RKI ... " + str(k) + " rows")
db.session.commit()
- app.logger.info(" import RKI Bundeslaender ... " + str(k) + " rows total")
+ app.logger.info(" import RKI ... " + str(k) + " rows total")
except KeyError as error:
app.logger.warning("WARN: import RKI [begin]")
app.logger.warning(":::"+str(error)+":::")
diff --git a/src/covid19/blueprints/rki_cases/rki_views.py b/src/covid19/blueprints/rki_cases/rki_views.py
index 231f8293..6e8a1e33 100644
--- a/src/covid19/blueprints/rki_cases/rki_views.py
+++ b/src/covid19/blueprints/rki_cases/rki_views.py
@@ -105,7 +105,7 @@ def task_rki_import(self):
@celery.task(bind=True)
def task_rki_full_update_dimensiontables(self):
self.update_state(state=states.STARTED)
- rki_service.task_full_update_dimensiontables()
+ rki_service.run_full_update_dimension_tables()
self.update_state(state=states.SUCCESS)
result = "OK (task_rki_full_update_dimensiontables)"
return result
@@ -114,7 +114,7 @@ def task_rki_full_update_dimensiontables(self):
@celery.task(bind=True)
def task_rki_update_dimensiontables(self):
self.update_state(state=states.STARTED)
- rki_service.task_update_dimensiontables()
+ rki_service.run_update_dimension_tables()
self.update_state(state=states.SUCCESS)
result = "OK (task_rki_update_dimensiontables)"
return result
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index 44966df6..398fce90 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -59,14 +59,14 @@ class RkiVaccinationServiceImport:
indikation_beruf_voll=self.__int(row['indikation_beruf_voll']),
indikation_medizinisch_voll=self.__int(row['indikation_medizinisch_voll']),
indikation_pflegeheim_voll=self.__int(row['indikation_pflegeheim_voll']),
- date_reported=date_reported,
+ # date_reported=date_reported,
datum=d.datum,
- year=d.year,
- month=d.month,
- day_of_month=d.day_of_month,
- day_of_week=d.day_of_week,
- week_of_year=d.day_of_week,
- year_week=d.year_week
+ # year=d.year,
+ # month=d.month,
+ # day_of_month=d.day_of_month,
+ # day_of_week=d.day_of_week,
+ # week_of_year=d.day_of_week,
+ # year_week=d.year_week
)
db.session.add(o)
k += 1
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
index 6b67f5bb..1a0ce0bf 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
@@ -35,11 +35,11 @@
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
href="{{ url_for( 'rki_vaccination.url_task_vaccination_download') }}"
- role="button">Vaccination :: Task :: download :: only</a>
+ role="button">Vaccination :: Task :: download</a>
<a class="btn btn-info btn-lg btn-block text-left"
href="{{ url_for( 'rki_vaccination.url_task_vaccination_import') }}"
- role="button">Vaccination :: Task :: import :: only</a>
+ role="button">Vaccination :: Task :: import</a>
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'rki_vaccination.url_task_vaccination_full_update_dimension_tables') }}"
@@ -55,11 +55,11 @@
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
href="{{ url_for( 'rki_vaccination.url_task_vaccination_download') }}"
- role="button">Vaccination :: Task :: download :: only</a>
+ role="button">Vaccination :: Task :: download</a>
<a class="btn btn-info btn-lg btn-block text-left"
href="{{ url_for( 'rki_vaccination.url_task_vaccination_import') }}"
- role="button">Vaccination :: Task :: import :: only</a>
+ role="button">Vaccination :: Task :: import</a>
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'rki_vaccination.url_task_vaccination_update_dimension_tables') }}"
--
GitLab