work

src/covid19/blueprints/common/common_model.py

@@ -54,11 +54,12 @@ class CommonDateReported(db.Model):
     def create_new_object_factory(cls, my_date_rep):
         my_datum = date.fromisoformat(my_date_rep)
         (my_iso_year, week_number, weekday) = my_datum.isocalendar()
+        my_year_week = "" + str(my_iso_year)
         if week_number < 10:
-            my_year_week = "" + str(my_iso_year) + "-0"+str(week_number)
+            my_year_week += "-0"
         else:
-            my_year_week = "" + str(my_iso_year) + "-"+str(week_number)
-        day_of_year = my_datum.timetuple()
+            my_year_week += "-"
+        my_year_week += str(week_number)
         return CommonDateReported(
             date_reported=my_date_rep,
             datum=my_datum,

src/covid19/blueprints/europe/europe_model.py

 from sqlalchemy import and_
-from datetime import date
 from database import db, ITEMS_PER_PAGE
 from covid19.blueprints.common.common_model import CommonDateReported, CommonRegion
 
@@ -9,22 +8,8 @@ class EuropeDateReported(CommonDateReported):
 
     @classmethod
     def create_new_object_factory(cls, my_date_rep):
-        my_datum = date.fromisoformat(my_date_rep)
-        (my_iso_year, week_number, weekday) = my_datum.isocalendar()
-        if week_number < 10:
-            my_year_week = "" + str(my_iso_year) + "-0" + str(week_number)
-        else:
-            my_year_week = "" + str(my_iso_year) + "-" + str(week_number)
-        return EuropeDateReported(
-            date_reported=my_date_rep,
-            datum=my_datum,
-            year=my_datum.year,
-            month=my_datum.month,
-            day_of_month=my_datum.day,
-            day_of_week=weekday,
-            week_of_year=week_number,
-            year_week=my_year_week
-        )
+        o = CommonDateReported.create_new_object_factory(my_date_rep)
+        return EuropeDateReported(o)
 
 
 class EuropeContinent(CommonRegion):

src/covid19/blueprints/who/who_model.py

@@ -7,6 +7,11 @@ from covid19.blueprints.common.common_model import CommonDateReported, CommonReg
 class WhoDateReported(CommonDateReported):
     __mapper_args__ = {'polymorphic_identity': 'who_date_reported'}
 
+    @classmethod
+    def create_new_object_factory(cls, my_date_rep):
+        o = cls.create_new_object_factory(my_date_rep)
+        return WhoDateReported(o)
+
 
 class WhoRegion(CommonRegion):
     __mapper_args__ = {'polymorphic_identity': 'who_region'}