From 4c3b448e04277d6d2ef03b6afae451187381cb23 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 28 Jan 2021 22:16:06 +0100
Subject: [PATCH] work
---
app/oodm/europe/europe_service.py | 6 +++---
app/oodm/europe/europe_service_import.py | 4 ++--
app/oodm/europe/europe_service_update.py | 2 +-
app/oodm/rki/rki_service.py | 6 +++---
app/oodm/rki/rki_service_import.py | 2 +-
app/oodm/rki/rki_service_update.py | 4 ++--
app/oodm/vaccination/vaccination_service.py | 4 ++--
app/oodm/vaccination/vaccination_service_import.py | 4 ++--
app/oodm/who/who_service.py | 6 +++---
app/oodm/who/who_service_import.py | 4 ++--
app/oodm/who/who_service_update.py | 4 ++--
11 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/app/oodm/europe/europe_service.py b/app/oodm/europe/europe_service.py
index 6f0b9e54..687e6676 100644
--- a/app/oodm/europe/europe_service.py
+++ b/app/oodm/europe/europe_service.py
@@ -1,9 +1,9 @@
import os
from database import app
-from app.oodm.woehlke.covid19.europe.europe_service_download import EuropeServiceDownload
-from app.oodm.woehlke.covid19.europe.europe_service_import import EuropeServiceImport
-from app.oodm.woehlke.covid19.europe.europe_service_update import EuropeServiceUpdate
+from app.oodm.europe.europe_service_download import EuropeServiceDownload
+from app.oodm.europe.europe_service_import import EuropeServiceImport
+from app.oodm.europe.europe_service_update import EuropeServiceUpdate
class EuropeService:
diff --git a/app/oodm/europe/europe_service_import.py b/app/oodm/europe/europe_service_import.py
index 1e55d423..25a68c13 100644
--- a/app/oodm/europe/europe_service_import.py
+++ b/app/oodm/europe/europe_service_import.py
@@ -3,8 +3,8 @@ import csv
import psycopg2
from database import db, app
-from app.oodm.woehlke.covid19.europe.europe_model import EuropeDataImportTable
-from app.oodm.woehlke.covid19.europe.europe_service_download import EuropeServiceDownloadConfig
+from app.oodm.europe.europe_model import EuropeDataImportTable
+from app.oodm.europe.europe_service_download import EuropeServiceDownloadConfig
class EuropeServiceImport:
diff --git a/app/oodm/europe/europe_service_update.py b/app/oodm/europe/europe_service_update.py
index 4de45ec4..646eacd8 100644
--- a/app/oodm/europe/europe_service_update.py
+++ b/app/oodm/europe/europe_service_update.py
@@ -1,6 +1,6 @@
import os
from database import db, app
-from app.oodm.woehlke.covid19.europe.europe_model import EuropeDataImportTable, \
+from app.oodm.europe.europe_model import EuropeDataImportTable, \
EuropeDateReported, EuropeContinent, EuropeCountry, EuropeData
diff --git a/app/oodm/rki/rki_service.py b/app/oodm/rki/rki_service.py
index 776371cb..054c3652 100644
--- a/app/oodm/rki/rki_service.py
+++ b/app/oodm/rki/rki_service.py
@@ -1,8 +1,8 @@
from database import app
-from app.oodm.woehlke.covid19.rki.rki_service_download import RkiServiceDownload
-from app.oodm.woehlke.covid19.rki.rki_service_import import RkiServiceImport
-from app.oodm.woehlke.covid19.rki.rki_service_update import RkiServiceUpdate
+from app.oodm.rki.rki_service_download import RkiServiceDownload
+from app.oodm.rki.rki_service_import import RkiServiceImport
+from app.oodm.rki.rki_service_update import RkiServiceUpdate
class RkiService:
diff --git a/app/oodm/rki/rki_service_import.py b/app/oodm/rki/rki_service_import.py
index 9976372b..839bac13 100644
--- a/app/oodm/rki/rki_service_import.py
+++ b/app/oodm/rki/rki_service_import.py
@@ -5,7 +5,7 @@ import psycopg2
from database import db, app
-from app.oodm.woehlke.covid19.who.who_model import WhoGlobalDataImportTable
+from app.oodm.who.who_model import WhoGlobalDataImportTable
class RkiServiceImport:
diff --git a/app/oodm/rki/rki_service_update.py b/app/oodm/rki/rki_service_update.py
index b07e0039..456cbdfd 100644
--- a/app/oodm/rki/rki_service_update.py
+++ b/app/oodm/rki/rki_service_update.py
@@ -1,7 +1,7 @@
from database import db, app
-from app.oodm.woehlke.covid19.rki.rki_model import RkiRegion, RkiDateReported, RkiCountry, RkiGermanyData
-from app.oodm.woehlke.covid19.rki.rki_model import RkiGermanyDataImportTable
+from app.oodm.rki.rki_model import RkiRegion, RkiDateReported, RkiCountry, RkiGermanyData
+from app.oodm.rki.rki_model import RkiGermanyDataImportTable
rki_service_update = None
diff --git a/app/oodm/vaccination/vaccination_service.py b/app/oodm/vaccination/vaccination_service.py
index 41375852..4fa7a9a5 100644
--- a/app/oodm/vaccination/vaccination_service.py
+++ b/app/oodm/vaccination/vaccination_service.py
@@ -1,8 +1,8 @@
import os
from database import app
-from app.oodm.woehlke.covid19.vaccination.vaccination_service_download import VaccinationServiceDownload
-from app.oodm.woehlke.covid19.vaccination.vaccination_service_import import VaccinationServiceImport
+from app.oodm.vaccination.vaccination_service_download import VaccinationServiceDownload
+from app.oodm.vaccination.vaccination_service_import import VaccinationServiceImport
class VaccinationService:
diff --git a/app/oodm/vaccination/vaccination_service_import.py b/app/oodm/vaccination/vaccination_service_import.py
index eec85c90..472e6ee9 100644
--- a/app/oodm/vaccination/vaccination_service_import.py
+++ b/app/oodm/vaccination/vaccination_service_import.py
@@ -3,8 +3,8 @@ import csv
import psycopg2
from database import db, app
-from app.oodm.woehlke.covid19.vaccination.vaccination_model import VaccinationGermanyTimeline
-from app.oodm.woehlke.covid19.vaccination.vaccination_service_download import VaccinationServiceDownloadConfig
+from app.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
+from app.oodm.vaccination.vaccination_service_download import VaccinationServiceDownloadConfig
class VaccinationServiceImport:
diff --git a/app/oodm/who/who_service.py b/app/oodm/who/who_service.py
index 1a8e9c0c..97ba2eb4 100644
--- a/app/oodm/who/who_service.py
+++ b/app/oodm/who/who_service.py
@@ -1,9 +1,9 @@
import os
from database import app
-from app.oodm.woehlke.covid19.who.who_service_download import WhoServiceDownload
-from app.oodm.woehlke.covid19.who.who_service_import import WhoServiceImport
-from app.oodm.woehlke.covid19.who.who_service_update import WhoServiceUpdate
+from app.oodm.who.who_service_download import WhoServiceDownload
+from app.oodm.who.who_service_import import WhoServiceImport
+from app.oodm.who.who_service_update import WhoServiceUpdate
class WhoService:
diff --git a/app/oodm/who/who_service_import.py b/app/oodm/who/who_service_import.py
index cc777c21..89a688e2 100644
--- a/app/oodm/who/who_service_import.py
+++ b/app/oodm/who/who_service_import.py
@@ -3,8 +3,8 @@ import sys
import csv
import psycopg2
from database import db, app
-from app.oodm.woehlke.covid19.who.who_model import WhoGlobalDataImportTable
-from app.oodm.woehlke.covid19.who.who_service_download import WhoServiceDownloadConfig
+from app.oodm.who.who_model import WhoGlobalDataImportTable
+from app.oodm.who.who_service_download import WhoServiceDownloadConfig
who_service_import = None
diff --git a/app/oodm/who/who_service_update.py b/app/oodm/who/who_service_update.py
index b216aa2a..f80f12bb 100644
--- a/app/oodm/who/who_service_update.py
+++ b/app/oodm/who/who_service_update.py
@@ -1,8 +1,8 @@
import os
from database import db, app
-from app.oodm.woehlke.covid19.who.who_model import WhoRegion, WhoDateReported, WhoCountry, WhoGlobalData
-from app.oodm.woehlke.covid19.who.who_model import WhoGlobalDataImportTable
+from app.oodm.who.who_model import WhoRegion, WhoDateReported, WhoCountry, WhoGlobalData
+from app.oodm.who.who_model import WhoGlobalDataImportTable
class WhoServiceUpdate:
--
GitLab