From 0a9debe851105fe0eca42e96fa95a01b857c710f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 22 May 2021 09:17:22 +0200
Subject: [PATCH] Refactoring: rename covid19 to flask_covid19
---
data | 2 +-
src/flask_covid19/blueprints/data_who/who_model.py | 4 ++--
src/flask_covid19/blueprints/data_who/who_model_import.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data b/data
index b2f21b3c..d7536ffe 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit b2f21b3c1e4fbac1060d293ee0f0b268ef2319bf
+Subproject commit d7536ffe546c76c662f38ad7f99122932ac6f420
diff --git a/src/flask_covid19/blueprints/data_who/who_model.py b/src/flask_covid19/blueprints/data_who/who_model.py
index b263c80e..fcabce35 100644
--- a/src/flask_covid19/blueprints/data_who/who_model.py
+++ b/src/flask_covid19/blueprints/data_who/who_model.py
@@ -171,9 +171,9 @@ class WhoData(BlueprintFactTable):
def __str__(self):
if id is not None:
- return "["+str(id)+"]" + self.date_reported.__str__() + self.location.__str__()
+ return "["+str(id)+"]" + self.date_reported.__str__() + " " + self.location.__str__()
else:
- return self.date_reported.__str__() + self.location.__str__()
+ return self.date_reported.__str__() + " " + self.location.__str__()
@classmethod
def find_one_or_none_by_date_and_country(cls, my_date_reported, my_country):
diff --git a/src/flask_covid19/blueprints/data_who/who_model_import.py b/src/flask_covid19/blueprints/data_who/who_model_import.py
index 9d9ac2a6..ebcb7ab9 100644
--- a/src/flask_covid19/blueprints/data_who/who_model_import.py
+++ b/src/flask_covid19/blueprints/data_who/who_model_import.py
@@ -18,7 +18,7 @@ class WhoImport(db.Model):
row_imported = db.Column(db.Boolean, nullable=False)
def __str__(self):
- return self.datum.isoformat() + " " + self.country_code + " " + self.country + str(self.row_imported)
+ return self.datum.isoformat() + " " + self.country_code + " " + self.country + " " + str(self.row_imported)
@classmethod
def remove_all(cls):
@@ -211,4 +211,4 @@ class WhoFlat(db.Model):
date_reported = db.Column(db.String(255), nullable=False)
def __str__(self):
- return self.datum.isoformat() + " " + self.location_code + " " + self.location + str(self.location_group)
+ return self.datum.isoformat() + " " + self.location_code + " " + self.location + " " + str(self.location_group)
--
GitLab