From 3f1700e6cc44b3d18238e7af4bae8a39bd0f3fd6 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 19:43:19 +0100
Subject: [PATCH] ### 0.0.13 Release * Fixed #49
EuropeServiceUpdate.__update_data_short() (wontfix) * Fixed #52 download
vaccination timeline data file * Fixed #53 import vaccination timeline data
file into db * Fixed #54 /vaccination/imported * Fixed #57 frontend: use npm
for handling 3rdParty css and javascript modules like jQuery, Bootstrap *
Fixed #58 frontend: remove jumbotron from all pageheader, put jumbotron as
main content on home page * Fixed #47 major refactoring: Routes from app.py
to org...who,europe,... (Doublette von #65) * Fixed #48 major refactoring:
Tasks from server_mq.py to org...who,europe,... (Doublette von #65) * Fixed
#64 major refactoring: create two packages: for web app and for celery worker
* Issue #65 major refactoring: add flask-blueprints for admin, common,
europe, rki, vaccination, who
### 0.0.14 Release
* Issue #66 frontend: migrate to Bootstrap Theme sb-admin-angular
* Issue #67 implement Flask-Login
### 0.0.15 Release
* Issue #5 Visual Graphs for Data per Countries order by Date
* Issue #59 frontend: add correct breadcrumb to every page
* Issue #60 frontend: better design for tables
* Issue #61 frontend: better design for navtabs
* Issue #62 frontend: better design for pages
* Issue #63 frontend: add footer design
### 0.0.16 Release
* Issue #28 /admin/database/import
* Issue #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Issue #40 SQLalchemy instead of SQL: EuropeDataImportTable.get_date_rep()
* Issue #41 SQLalchemy instead of SQL: EuropeDataImportTable.get_countries_of_continent()
* Issue #42 SQLalchemy instead of SQL: WhoGlobalDataImportTable.get_new_dates_as_array()
---
covid19/oodm/europe/europe_service_download.py | 3 +--
covid19/oodm/rki/rki_service_download.py | 5 ++---
covid19/oodm/vaccination/vaccination_service_download.py | 4 ++--
covid19/oodm/who/who_service_download.py | 5 ++---
covid19/oodm/who/who_service_update.py | 2 +-
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/covid19/oodm/europe/europe_service_download.py b/covid19/oodm/europe/europe_service_download.py
index 39d880a0..d6144347 100644
--- a/covid19/oodm/europe/europe_service_download.py
+++ b/covid19/oodm/europe/europe_service_download.py
@@ -22,9 +22,8 @@ class EuropeServiceDownload:
app.logger.info("------------------------------------------------------------")
app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src_data)
app.logger.info("------------------------------------------------------------")
- os.makedirs('data', exist_ok=True)
- app.logger.info("------------------------------------------------------------")
try:
+ os.makedirs(self.cfg.data_path, exist_ok=True)
if os.path.isfile(src_cvsfile_name):
os.remove(src_cvsfile_name)
wget.download(self.cfg.url_src_data, src_cvsfile_name)
diff --git a/covid19/oodm/rki/rki_service_download.py b/covid19/oodm/rki/rki_service_download.py
index ed188bd7..239ac9f6 100644
--- a/covid19/oodm/rki/rki_service_download.py
+++ b/covid19/oodm/rki/rki_service_download.py
@@ -28,11 +28,10 @@ class RkiServiceDownload:
src_cvsfile_path = ".." + os.sep + "data" + os.sep + cvsfile_name
app.logger.info(" download - RKI "+datascope+" [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+cvsfile_name+" ")
- app.logger.info(" FROM: "+url_src+" ")
+ app.logger.info(" FILE: "+cvsfile_name+" <- "+url_src)
app.logger.info("------------------------------------------------------------")
- #os.makedirs('data', exist_ok=True)
try:
+ os.makedirs(self.cfg.data_path, exist_ok=True)
if os.path.isfile(src_cvsfile_path):
os.remove(src_cvsfile_path)
data_file = wget.download(url_src, src_cvsfile_path)
diff --git a/covid19/oodm/vaccination/vaccination_service_download.py b/covid19/oodm/vaccination/vaccination_service_download.py
index 0ef205ae..fd43e8f0 100644
--- a/covid19/oodm/vaccination/vaccination_service_download.py
+++ b/covid19/oodm/vaccination/vaccination_service_download.py
@@ -18,10 +18,10 @@ class VaccinationServiceDownload:
def download_file(self):
app.logger.info(" download - Vaccination [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" ")
- app.logger.info(" FROM: "+self.cfg.url_src_data+" ")
+ app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src_data)
app.logger.info("------------------------------------------------------------")
try:
+ os.makedirs(self.cfg.data_path, exist_ok=True)
if os.path.isfile(self.cfg.cvsfile_path):
os.remove(self.cfg.cvsfile_path)
data_file = wget.download(self.cfg.url_src_data, self.cfg.cvsfile_path)
diff --git a/covid19/oodm/who/who_service_download.py b/covid19/oodm/who/who_service_download.py
index 1fab2a1a..6d2553f5 100644
--- a/covid19/oodm/who/who_service_download.py
+++ b/covid19/oodm/who/who_service_download.py
@@ -19,11 +19,10 @@ class WhoServiceDownload:
src_cvsfile_name = self.cfg.data_path+os.sep+self.cfg.cvsfile_name
app.logger.info(" download - [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" ")
- app.logger.info(" FROM: "+self.cfg.url_src_data+" ")
+ app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src_data)
app.logger.info("------------------------------------------------------------")
- os.makedirs(self.cfg.data_path, exist_ok=True)
try:
+ os.makedirs(self.cfg.data_path, exist_ok=True)
if os.path.isfile(src_cvsfile_name):
os.remove(src_cvsfile_name)
data_file = wget.download(self.cfg.url_src_data, src_cvsfile_name)
diff --git a/covid19/oodm/who/who_service_update.py b/covid19/oodm/who/who_service_update.py
index 84181cbb..3ae26cc7 100644
--- a/covid19/oodm/who/who_service_update.py
+++ b/covid19/oodm/who/who_service_update.py
@@ -39,7 +39,7 @@ class WhoServiceUpdate:
app.logger.info("------------------------------------------------------------")
i = 0
for i_who_region, in WhoGlobalDataImportTable.get_regions():
- c = WhoRegion.find_by_region()
+ c = WhoRegion.find_by_region(i_who_region)
if c is None:
o = WhoRegion(region=i_who_region)
db.session.add(o)
--
GitLab